reis-mobile 0.4.0 → 0.5.0

package/.claude-plugin/marketplace.json

@@ -5,14 +5,14 @@
   },
   "metadata": {
     "description": "AI agents for mobile engineering",
-    "version": "0.4.0"
+    "version": "0.5.0"
   },
   "plugins": [
     {
       "name": "reis-mobile",
       "source": "./",
       "description": "AI agents, skills and workflows for Flutter, Android, iOS and React Native development.",
-      "version": "0.4.0",
+      "version": "0.5.0",
       "author": {
         "name": "Warleson Reis"
       },

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "reis-mobile",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "AI agents, skills and workflows for Flutter, Android, iOS and React Native development. Run /reis-mobile:doctor, then /reis-mobile:review.",
   "author": {
     "name": "Warleson Reis"

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 Format based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). The project follows [Semantic Versioning](https://semver.org/).
 
+## [0.5.0] - 2026-09-16
+
+### Changed
+
+- **Breaking:** the review skills are consolidated into `mobile-code-review`, with the review process in `SKILL.md` and a checklist per platform: Flutter (the former `flutter-code-review`, `flutter-widget-review`, `flutter-project-audit` and `flutter-dart-run-static-analysis`, in `references/flutter/`), native Android (the former `android-code-review`), native iOS (the former `ios-code-review`) and a new React Native checklist. `mobile-security-audit`, `android-intent-security` and `flutter-effective-dart` stay separate. A review request on a Flutter app loads 3 skills instead of 6.
+- **Breaking:** the debugging skills are consolidated into `mobile-debug`, with the debugging process in `SKILL.md` and a guide per platform and layer: Flutter (the former `flutter-build-debug`, `flutter-errors`, `flutter-fix-layout-issues`, `flutter-dart-fix-runtime-errors` and `flutter-dart-resolve-package-conflicts`, in `references/flutter/`), Android (the former `android-gradle-build-debug`, plus runtime crashes, R8 retrace and ANRs), iOS (the former `ios-xcode-build-debug` and `ios-cocoapods-debug`, plus crash logs and sanitizers) and a new React Native guide (Metro, native modules not found, Hermes). `/reis-mobile:debug` passes the detected area so the skill opens the right guide.
+- **Breaking:** the security skills are consolidated into `mobile-security` (the former `mobile-security-audit`), with the OWASP MASVS checks for every stack in `SKILL.md` and a checklist per platform: Flutter (with the former `flutter-secure-token-store` guide), Android (with the former `android-intent-security` guide, plus `PendingIntent`s, app links and `FLAG_SECURE`), iOS (Data Protection, Keychain accessibility, privacy manifests) and React Native (bundled environment variables, Hermes, signed over-the-air updates). The audit no longer treats `google-services.json` and `GoogleService-Info.plist` as secrets, in line with `mobile-firebase`.
+- **Breaking:** every skill starts with `mobile-`, and there are 11: topic skills with a reference per platform (`mobile-architecture`, `mobile-code-review`, `mobile-debug`, `mobile-test`, `mobile-security`, `mobile-firebase`, `mobile-detect-stack`) and platform skills with what exists only on one stack (`mobile-flutter`, `mobile-android`, `mobile-ios`, `mobile-rn`). `reis-mobile validate` enforces both kinds.
+- `mobile-architecture` replaces the Flutter architecture and state management skills (`flutter-app-architecture`, `flutter-architecture-feature-first`, `flutter-apply-architecture-best-practices`, `flutter-managing-state`, `flutter-bloc`, `flutter-riverpod`, `flutter-provider`, `flutter-change-notifier`, `flutter-login-usecase`) and adds architecture guides for Android, iOS and React Native.
+- `mobile-flutter` holds the other Flutter skills, grouped by theme: UI and navigation, data, native code, performance, accessibility and i18n, Dart, and setup.
+- `mobile-android` holds the 22 remaining guides from `android/skills`, grouped by theme, each as a folder with its references and scripts.
+- New `mobile-ios` and `mobile-rn` skills with guides for UI and navigation, data and networking, platform features, and performance and release.
+- The plugin's fixed context cost drops to about 3,900 tokens per session.
+- The npm description and keywords, and the README introduction, name the stacks and tools people search for (Flutter, iOS, React Native, Claude Code, Codex, agent skills).
+
 ## [0.4.0] - 2026-09-16
 
 ### Added

package/README.md

@@ -2,11 +2,11 @@
 
 A mobile app is not a generic project. A code review that does not know about `BuildContext` after `await`, `android:exported`, `NSAllowsArbitraryLoads` or `Podfile.lock` lets through exactly the bugs that only show up on the device. **reis-mobile** detects your project's stack, picks the right specialist and loads only the skills that apply to Flutter, Android, iOS or React Native.
 
-**AI agents for mobile engineering.** A Claude Code plugin with agents, skills and workflows specialized in mobile development.
+**AI agents and skills for mobile development — Flutter, Android, iOS and React Native.** A plugin for Claude Code and Codex with specialist agents and skills for code review, debugging, tests, architecture, security and Firebase.
 
 <p align="center">
   <a href="https://github.com/wrsilva/reis-mobile/actions/workflows/ci.yml"><img src="https://github.com/wrsilva/reis-mobile/actions/workflows/ci.yml/badge.svg" alt="CI"></a>
-  <img src="https://img.shields.io/badge/Version-0.4.0-blue" alt="Version 0.4.0">
+  <img src="https://img.shields.io/badge/Version-0.5.0-blue" alt="Version 0.5.0">
   <img src="https://img.shields.io/badge/Claude_Code-plugin-blueviolet" alt="Claude Code plugin">
   <img src="https://img.shields.io/badge/Node.js-22+-339933?logo=node.js&logoColor=white" alt="Node.js 22+">
   <img src="https://img.shields.io/badge/Dependencies-0-brightgreen" alt="Zero dependencies">
@@ -23,7 +23,7 @@ A mobile app is not a generic project. A code review that does not know about `B
 
 🔎 **Detects the stack on its own.** Flutter (app or plugin), React Native (including Expo), Kotlin Multiplatform, native Android and iOS, with languages and target platforms. A Flutter app with `android/` and `ios/` is still Flutter.
 
-👥 **16 agents and 74 mobile skills.** Architect, performance and test engineers for Flutter, native Android, native iOS and React Native, a staff engineer, a native plugin specialist, a code reviewer and a lead that coordinates them all, plus skills for Gradle, Xcode and CocoaPods builds, Jetpack Compose, BLoC, Riverpod, Firebase and testing on every platform, plugins and security.
+👥 **16 agents and 11 mobile skills.** Architect, performance and test engineers for Flutter, native Android, native iOS and React Native, a staff engineer, a native plugin specialist, a code reviewer and a lead that coordinates them all, plus skills for Gradle, Xcode and CocoaPods builds, Jetpack Compose, BLoC, Riverpod, Firebase and testing on every platform, plugins and security.
 
 🌐 **Answers in English or Portuguese.** `reis-mobile init eng` or `reis-mobile init pt` sets the language of reports, explanations and debates.
 
@@ -52,7 +52,8 @@ A mobile app is not a generic project. A code review that does not know about `B
 
 | Version | Highlights |
 |--------|-----------|
-| **v0.4.0** (current) | Native Android, iOS and React Native: architect, performance and test agents for each; `/reis-mobile:debug` for Gradle, Xcode, CocoaPods and Flutter failures; `mobile-test` and `mobile-firebase` with a guide per platform; the Android team's skills; `.reis-mobile/config.yaml` for monorepos. Skills now use stack prefixes. |
+| **v0.5.0** (current) | 11 skills instead of 60: topic skills with a guide per platform (`mobile-architecture`, `mobile-code-review`, `mobile-debug`, `mobile-test`, `mobile-security`, `mobile-firebase`) and platform skills (`mobile-flutter`, `mobile-android`, and the new `mobile-ios` and `mobile-rn`). Half the fixed context cost. |
+| **v0.4.0** | Native Android, iOS and React Native: architect, performance and test agents for each; `/reis-mobile:debug` for Gradle, Xcode, CocoaPods and Flutter failures; `mobile-test` and `mobile-firebase` with a guide per platform; the Android team's skills; `.reis-mobile/config.yaml` for monorepos. Skills now use stack prefixes. |
 | **v0.3.6** | `reis-mobile init eng` installs the plugin in Claude Code and Codex at once, skipping whichever is not installed; `init --uninstall` removes it from both. |
 | **v0.3.5** | Installs through npm and the Claude Code and Codex plugins. |
 | **v0.3.4** | Back to the `reis-mobile` name: `reis-mobile` CLI and `/reis-mobile:*` commands, undoing the `mobile` renames of v0.3.2 and v0.3.3. |
@@ -235,7 +236,7 @@ $ reis-mobile route "Execution failed for task ':app:compileDebugKotlin'"
 Intent      debug (confidence 0.5) · area gradle
 Stack       flutter · focus android
 Agent       mobile-staff-engineer
-Skills      flutter-build-debug, flutter-dart-fix-runtime-errors, flutter-dart-resolve-package-conflicts, flutter-errors, flutter-fix-layout-issues, android-gradle-build-debug
+Skills      mobile-debug
 
 $ reis-mobile route "write tests for the login cubit"
 Intent      test (confidence 1)
@@ -263,9 +264,9 @@ The router never invents a specialist: if no agent serves the intent, it warns y
 | Build a plugin or debug MethodChannel/EventChannel | agent `plugin-native-expert` | ✅ |
 | Full audit with several specialists | agent `lead-mobile` | ✅ |
 | Decide between two architectures with a real trade-off | `/reis-mobile:debate` | ✅ |
-| Dedicated test command (including XCTest and Espresso) | `/reis-mobile:test` | 🔜 v0.5 |
-| Check whether the app is ready for the store | `/reis-mobile:release` | 🔜 v0.5 |
-| Consolidated decision by consensus between agents | `/reis-mobile:council` | 🔜 v0.8 |
+| Dedicated test command (including XCTest and Espresso) | `/reis-mobile:test` | 🔜 v0.6 |
+| Check whether the app is ready for the store | `/reis-mobile:release` | 🔜 v0.7 |
+| Consolidated decision by consensus between agents | `/reis-mobile:council` | 🔜 v0.9 |
 
 <details>
 <summary><strong>How is it different from plain Claude Code?</strong></summary>
@@ -276,8 +277,8 @@ The router never invents a specialist: if no agent serves the intent, it warns y
 | **Project context** | You explain the stack | Deterministic detection of stack, platform and variant |
 | **Review** | Generic | Mobile checklists: lifecycle, `BuildContext`, MASVS, manifest, ATS |
 | **Secrets in the diff** | Sent as they are | Masked before reaching the model |
-| **Specialists** | None | 16 agents and 74 mobile skills |
-| **Context cost** | Zero | ~8,400 fixed tokens (agent and skill descriptions), no hooks |
+| **Specialists** | None | 16 agents and 11 mobile skills |
+| **Context cost** | Zero | ~3,900 fixed tokens (agent and skill descriptions), no hooks |
 | **Best for** | General tasks | Teams and developers working on mobile apps |
 
 **In short:** Claude Code already knows how to code. reis-mobile makes it look at what matters in a mobile app.
@@ -294,7 +295,7 @@ The router never invents a specialist: if no agent serves the intent, it warns y
      ├─ detect stack ──────── pubspec.yaml → flutter (android, ios)
      ├─ detect intent ─────── review
      ├─ select agent ──────── mobile-code-reviewer
-     ├─ select skills ─────── flutter-code-review · flutter-effective-dart · flutter-project-audit · flutter-widget-review · mobile-security-audit …
+     ├─ select skills ─────── mobile-code-review · mobile-flutter · mobile-security
      ├─ collect context ───── git diff (lock files out, secrets masked)
      └─ review report ─────── Summary · Critical · Bugs · Architecture · Security · Performance · Maintainability
 ```
@@ -336,195 +337,25 @@ When more than one agent serves the intent, the stack-specific one wins. In a Fl
 
 ### Skills
 
-**Auto-routed** skills are loaded by the router together with the agent. The others (—) are triggered by Claude Code when the request matches the description, for example *"add push notifications with FCM"* → `mobile-firebase`.
+Every skill starts with `mobile-`. **Topic** skills cover every stack with one reference per platform; **platform** skills hold what exists only on one stack. A request loads the skill, and the model then opens only the reference for your stack and task.
 
-<details>
-<summary><strong>Review and quality</strong> (7)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `flutter-code-review` | Performs thorough code reviews for Flutter/Dart pull requests and merge requests. | review | Flutter | evanca/flutter-ai-rules |
-| `flutter-effective-dart` | Applies Effective Dart guidelines in Flutter/Dart code. | review | Flutter | evanca/flutter-ai-rules |
-| `flutter-dart-run-static-analysis` | Execute `dart analyze` to identify warnings and errors, and use `dart fix --apply` to automatically resolve… | review | Flutter | dart-lang/skills |
-| `flutter-project-audit` | Audits the health of a Flutter project as a whole — pubspec constraints and lock file, analysis_options and lints,… | review, architecture, dependency | Flutter | reis-mobile |
-| `flutter-widget-review` | Reviews Flutter widget code for lifecycle bugs, BuildContext misuse across async gaps, missing dispose, side effects… | review, performance | Flutter | reis-mobile |
-| `flutter-dart-3-updates` | Applies Dart 3 language features in Flutter/Dart code. | migration | Flutter | evanca/flutter-ai-rules |
-| `flutter-dart-use-pattern-matching` | Applies Dart 3 pattern matching, switch expressions, and destructuring idiomatically to validate data schemas,… | — | Flutter | dart-lang/skills |
-
-</details>
-
-<details>
-<summary><strong>Architecture and state</strong> (9)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `flutter-architecture-feature-first` | Structures Flutter apps using layered architecture (UI / Logic / Data) with feature-first file organization. | architecture | Flutter | evanca/flutter-ai-rules |
-| `flutter-app-architecture` | Provides best practices for Flutter app architecture, including layered architecture, data flow, state management… | architecture | Flutter | evanca/flutter-ai-rules |
-| `flutter-apply-architecture-best-practices` | Architects a Flutter application using the recommended layered approach (UI, Logic, Data). | architecture | Flutter | flutter/skills |
-| `flutter-managing-state` | Manages application and ephemeral state in a Flutter app. | architecture | Flutter | flutter/skills |
-| `flutter-bloc` | Implements Flutter state management using the bloc library (Bloc and Cubit). | — | Flutter | evanca/flutter-ai-rules |
-| `flutter-riverpod` | Uses Riverpod for state management in Flutter/Dart. | — | Flutter | evanca/flutter-ai-rules |
-| `flutter-provider` | Uses the Provider package for dependency injection and state management in Flutter. | — | Flutter | evanca/flutter-ai-rules |
-| `flutter-change-notifier` | Implements state management with ChangeNotifier and Provider in Flutter. | — | Flutter | evanca/flutter-ai-rules |
-| `flutter-login-usecase` | Implements a Flutter login use case that authenticates through an injected repository and persists the access token… | — | Flutter | reis-mobile |
-
-</details>
-
-<details>
-<summary><strong>Testing</strong> (1)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `mobile-test` | Unit, widget, integration and end-to-end tests, mocks and coverage for Flutter, native Android, native iOS and React Native, with one reference per platform. | test | all | reis-mobile, flutter/skills, dart-lang/skills, evanca/flutter-ai-rules, android/skills |
-
-</details>
-
-<details>
-<summary><strong>Debug</strong> (5)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `flutter-errors` | Diagnoses and fixes common Flutter errors. | debug | Flutter | evanca/flutter-ai-rules |
-| `flutter-fix-layout-issues` | Fixes Flutter layout errors (overflows, unbounded constraints) using Dart and Flutter MCP tools. | debug | Flutter | flutter/skills |
-| `flutter-dart-fix-runtime-errors` | Uses get_runtime_errors and lsp to fetch an active stack trace, locate the failing line, apply a fix, and verify… | debug | Flutter | dart-lang/skills |
-| `flutter-dart-resolve-package-conflicts` | Workflow for fixing package version conflicts. | debug, dependency | Flutter | dart-lang/skills |
-| `flutter-build-debug` | Diagnoses failing Flutter builds by locating the layer that broke — Dart compilation, pub version solving… | debug, build, dependency, migration | Flutter | reis-mobile |
-
-</details>
-
-<details>
-<summary><strong>Performance</strong> (3)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `flutter-reducing-app-size` | Measures and optimizes the size of Flutter application bundles for deployment. | performance | Flutter | flutter/skills |
-| `flutter-handling-concurrency` | Executes long-running tasks in background isolates to keep the UI responsive. | performance | Flutter | flutter/skills |
-| `flutter-caching-data` | Implements caching strategies for Flutter apps to improve performance and offline support. | — | Flutter | flutter/skills |
-
-</details>
-
-<details>
-<summary><strong>UI, layout and navigation</strong> (8)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `flutter-building-layouts` | Builds Flutter layouts using the constraint system and layout widgets. | — | Flutter | flutter/skills |
-| `flutter-build-responsive-layout` | Use `LayoutBuilder`, `MediaQuery`, or `Expanded/Flexible` to create a layout that adapts to different screen sizes. | — | Flutter | flutter/skills |
-| `flutter-building-forms` | Builds Flutter forms with validation and user input handling. | — | Flutter | flutter/skills |
-| `flutter-animating-apps` | Implements animated effects, transitions, and motion in a Flutter app. | — | Flutter | flutter/skills |
-| `flutter-theming-apps` | Customizes the visual appearance of a Flutter app using the theming system. | — | Flutter | flutter/skills |
-| `flutter-add-widget-preview` | Adds interactive widget previews to the project using the previews.dart system. | — | Flutter | flutter/skills |
-| `flutter-setup-declarative-routing` | Configure `MaterialApp.router` using a package like `go_router` for advanced URL-based navigation. | — | Flutter | flutter/skills |
-| `flutter-adding-home-screen-widgets` | Adds home screen widgets to a Flutter app for Android and iOS. | — | Flutter | flutter/skills |
-
-</details>
-
-<details>
-<summary><strong>Data and networking</strong> (3)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `flutter-use-http-package` | Use the `http` package to execute GET, POST, PUT, or DELETE requests. | — | Flutter | flutter/skills |
-| `flutter-implement-json-serialization` | Create model classes with `fromJson` and `toJson` methods using `dart:convert`. | — | Flutter | flutter/skills |
-| `flutter-working-with-databases` | Manages local data persistence using SQLite or other database solutions. | — | Flutter | flutter/skills |
-
-</details>
-
-<details>
-<summary><strong>Native and plugins</strong> (3)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `flutter-building-plugins` | Builds Flutter plugins that provide native interop for other apps to use. | — | Flutter | flutter/skills |
-| `flutter-interoperating-with-native-apis` | Interoperates with native platform APIs on Android, iOS, and the web. | — | Flutter | flutter/skills |
-| `flutter-embedding-native-views` | Embeds native Android, iOS, or macOS views into a Flutter app. | — | Flutter | flutter/skills |
-
-</details>
-
-<details>
-<summary><strong>Security</strong> (2)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `mobile-security-audit` | Security audit for mobile apps based on the OWASP MASVS categories — insecure token storage, hardcoded secrets,… | review, security, release | all | reis-mobile |
-| `flutter-secure-token-store` | Stores JWT access tokens on Flutter with platform secure storage (Keychain on iOS, Keystore-backed storage on… | security | Flutter | reis-mobile |
-
-</details>
-
-<details>
-<summary><strong>Accessibility and internationalization</strong> (2)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `flutter-improving-accessibility` | Configures a Flutter app to support assistive technologies like Screen Readers. | accessibility | Flutter | flutter/skills |
-| `flutter-setup-localization` | Add `flutter_localizations` and `intl` dependencies, enable "generate true" in `pubspec.yaml`, and create an… | — | Flutter | flutter/skills |
-
-</details>
-
-<details>
-<summary><strong>Firebase</strong> (1)</summary>
+| Skill | Covers | Auto-routed for | References |
+|---|---|---|---|
+| `mobile-architecture` | Layers, state management, modularization, DI, navigation | architecture | Flutter (BLoC, Riverpod, Provider, ChangeNotifier...), Android, iOS, React Native |
+| `mobile-code-review` | Review process and checklists | review, performance | Flutter (PR review, widgets, project audit, static analysis), Android, iOS, React Native |
+| `mobile-debug` | Failing builds and runtime errors | debug, build, dependency, migration | Flutter (build, runtime, layout, packages), Android (Gradle, crashes, ANRs), iOS (Xcode, CocoaPods, crash logs), React Native (Metro, native modules) |
+| `mobile-test` | Unit, UI, integration and end-to-end tests | test | Flutter (widget, integration, Patrol, mocks, coverage), Android, iOS, React Native |
+| `mobile-security` | OWASP MASVS security checks | review, security, release | Flutter (token storage), Android (intents), iOS, React Native |
+| `mobile-firebase` | Firebase setup and 13 products | — | Flutter, Android, iOS, React Native, each with a guide per product |
+| `mobile-flutter` | Flutter and Dart specifics | review, performance, accessibility, migration | UI and navigation, data, native code, performance, accessibility and i18n, Dart, setup |
+| `mobile-android` | Native Android specifics, from the Android team | performance, release, migration, build, dependency | Compose UI, AGP 9 and R8, profiling, Google Play, identity, camera and media, on-device AI, Wear OS, TV, XR |
+| `mobile-ios` | Native iOS specifics | performance, release, accessibility | UI and navigation, data and networking, platform features, performance and release |
+| `mobile-rn` | React Native and Expo specifics | performance, release, accessibility | UI and navigation, data and networking, platform features, performance and release |
+| `mobile-detect-stack` | Deterministic stack detection with the CLI | — | — |
 
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `mobile-firebase` | Firebase on Flutter, native Android, native iOS and React Native: setup, Authentication, Firestore, Realtime Database, Storage, Functions, Messaging, Analytics, Crashlytics, Remote Config, App Check, In-App Messaging, AI Logic and SQL Connect, with a guide per platform and product. | — | all | reis-mobile, evanca/flutter-ai-rules |
-
-</details>
-
-<details>
-<summary><strong>Native Android</strong> (25)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `android-code-review` | Reviews native Android code in Kotlin and Java for the bugs that reach production — lifecycle and Context leaks… | review, performance | Android, kotlin-multiplatform | reis-mobile |
-| `android-gradle-build-debug` | Diagnoses failing Android Gradle builds — JDK, Gradle, Android Gradle Plugin and Kotlin version mismatches… | debug, build, dependency, migration | Android, kotlin-multiplatform | reis-mobile |
-| `android-intent-security` | Best practices for Android Intent security. | security, review | Android | android/skills |
-| `android-agp-9-upgrade` | Upgrades, or migrates, an Android project to use Android Gradle Plugin (AGP) version 9. | migration, build, dependency | Android | android/skills |
-| `android-r8-analyzer` | Analyzes Android build files and R8 keep rules to identify redundancies, broad package-wide rules, and rules that… | performance, build | Android | android/skills |
-| `android-profiler` | Manages Android performance profiling and debugging. | performance | Android | android/skills |
-| `android-play-policy-insights` | Automated auditor designed to verify Android applications against Google Play Policy domains. | release | Android | android/skills |
-| `android-play-billing-library-version-upgrade` | Use this skill when upgrading or migrating an Android project from any legacy Google Play Billing Library (PBL)… | — | Android | android/skills |
-| `android-engage-sdk-integration` | Helps developers integrate, debug, and resolve Play Engage SDK implementation issues. | — | Android | android/skills |
-| `android-migrate-xml-views-to-jetpack-compose` | Provides a structured workflow for migrating an Android XML View to Jetpack Compose. | — | Android | android/skills |
-| `android-adaptive` | Instructions to make or update an app's UI so that it adapts to different Android devices including phones… | — | Android | android/skills |
-| `android-edge-to-edge` | Use this skill to migrate your Jetpack Compose app to add adaptive edge-to-edge support and troubleshoot common… | — | Android | android/skills |
-| `android-styles` | Use this skill to integrate the Jetpack Compose Styles API into an Android project. | — | Android | android/skills |
-| `android-navigation-3` | Learn how to install and migrate to Jetpack Navigation 3, and how to implement features and patterns such as deep… | — | Android | android/skills |
-| `android-navigation-event` | Intercept back gestures and run Predictive Back animations using the NavigationEvent (androidx.navigationevent)… | — | Android | android/skills |
-| `android-camerax` | Provide technical guidance for Android camera development with CameraX. | — | Android | android/skills |
-| `android-media3-cast-integration` | Implements Google Cast support in Android apps using Jetpack Media3. | — | Android | android/skills |
-| `android-restore-credentials` | Provides knowledge and workflows to implement Android's Restore Credentials feature using the androidx.credentials… | — | Android | android/skills |
-| `android-verified-email` | Provides a complete workflow for implementing verified email retrieval on Android Credential Manager API. | — | Android | android/skills |
-| `android-appfunctions` | Analyzes Android apps to identify key user workflows for AppFunctions such as creating a note, playing media, or… | — | Android | android/skills |
-| `android-ml-kit-genai-prompt-api` | Analyzes Android codebases to implement ML Kit GenAI Prompt API. | — | Android | android/skills |
-| `android-wear-compose-m3` | Expert guidance for working with Wear OS Compose Material3. | — | Android | android/skills |
-| `android-leanback-to-compose-tv-migration` | Provides instructions and architectural patterns for migrating Android TV applications from legacy Leanback UI… | — | Android | android/skills |
-| `android-display-glasses-with-jetpack-compose-glimmer` | Provides guidelines for developing projected Android XR apps for display glasses using the Jetpack Compose Glimmer… | — | Android | android/skills |
-| `android-cli` | Provides instructions for installing and using the `android` CLI. | — | Android | android/skills |
-
-</details>
-
-<details>
-<summary><strong>Native iOS</strong> (3)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `ios-code-review` | Reviews native iOS code in Swift and Objective-C for the bugs that reach production — retain cycles in closures… | review, performance | iOS | reis-mobile |
-| `ios-xcode-build-debug` | Diagnoses failing iOS builds in Xcode and xcodebuild — code signing and provisioning, deployment target… | debug, build, release, migration | iOS | reis-mobile |
-| `ios-cocoapods-debug` | Diagnoses CocoaPods failures in iOS, Flutter and React Native projects — "could not find compatible versions"… | debug, dependency, build, migration | iOS | reis-mobile |
-
-</details>
-
-<details>
-<summary><strong>Environment</strong> (2)</summary>
-
-| Skill | What it does | Auto-routed for | Stack | Origin |
-|---|---|---|---|---|
-| `flutter-setting-up-on-macos` | Sets up a macOS environment for Flutter development. | — | Flutter | flutter/skills |
-| `mobile-detect-stack` | Detects the mobile stack of the current project (Flutter, Android, iOS, React Native, Kotlin Multiplatform), its… | — | all | reis-mobile |
-
-</details>
+Skills marked — are triggered by Claude Code when the request matches their description, for example *"add push notifications with FCM"* → `mobile-firebase`.
 
-Third-party skills keep their original name and license. See [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md).
+About 85 guides come from [flutter/skills](https://github.com/flutter/skills), [dart-lang/skills](https://github.com/dart-lang/skills), [evanca/flutter-ai-rules](https://github.com/evanca/flutter-ai-rules) and [android/skills](https://github.com/android/skills), unchanged and credited in [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md).
 
 ---
 
@@ -534,11 +365,11 @@ Third-party skills keep their original name and license. See [THIRD_PARTY_NOTICE
 
 **Secrets masked.** The diff goes through [`core/security/redact.mjs`](core/security/redact.mjs) before reaching the model. Lock files and generated code (`*.g.dart`, `*.freezed.dart`, `*.pbxproj`) stay out of the diff. Redaction is a protection layer, not a guarantee. See [SECURITY.md](SECURITY.md).
 
-**No telemetry.** `detect`, `doctor`, `route`, `review` and `debug` make no network calls. Only installation touches the network, to download the package and register the plugin. One imported skill, `android-play-policy-insights`, runs Python scripts that download your app's public Google Play listing when the model uses it. The AI analysis uses the model of the session you are working in, such as Claude Code or Codex.
+**No telemetry.** `detect`, `doctor`, `route`, `review` and `debug` make no network calls. Only installation touches the network, to download the package and register the plugin. The Google Play policy guide in `mobile-android` runs Python scripts that download your app's public Google Play listing when the model uses it. The AI analysis uses the model of the session you are working in, such as Claude Code or Codex.
 
 **Exception: `/reis-mobile:debate --external`.** This flag, and only this flag, sends the debate context — including excerpts of the files mentioned in the question — to the `codex` and `gemini` CLIs, which are third-party and have their own data policies. Without the flag, nothing leaves your session. The `review` diff is masked by `redact.mjs`, but the context you cite in a debate question does not go through that layer: check what you are sending before using `--external`.
 
-**Context cost.** The descriptions of the 16 agents and 74 skills add up to about 8,400 fixed tokens per session, estimated from their length (v0.3 measured about 4,800 with `claude plugin details reis-mobile`). The full content of each skill is only loaded when it is used.
+**Context cost.** The descriptions of the 16 agents and 11 skills add up to about 3,900 fixed tokens per session, estimated from their length (v0.3 measured about 4,800 with `claude plugin details reis-mobile`). The full content of each skill is only loaded when it is used.
 
 **No hooks.** The plugin does not attach to Claude Code events. It only acts when you call a command or when a skill is relevant.
 
@@ -561,9 +392,9 @@ Third-party skills keep their original name and license. See [THIRD_PARTY_NOTICE
 | v0.3.5 | Distribution through npm and the Claude Code and Codex plugins only | ✅ |
 | v0.3.6 | `reis-mobile init` installs in Claude Code and Codex | ✅ |
 | v0.4.0 | Native Android and iOS skills, architect, performance and test agents for Android, iOS and React Native, `.reis-mobile/config.yaml` and `/reis-mobile:debug` (Gradle, Xcode, CocoaPods, Flutter) | ✅ |
-| v0.5.0 | `/reis-mobile:test` and native tests (XCTest, Espresso) | ⏳ |
-| v0.6.0 | `/reis-mobile:release` with quality gates | ⏳ |
-| v0.7.0 | React Native pack | ⏳ |
+| v0.5.0 | Topic and platform skills (`mobile-*`), with guides for Flutter, Android, iOS and React Native in each; new `mobile-ios` and `mobile-rn` | ✅ |
+| v0.6.0 | `/reis-mobile:test` and native tests (XCTest, Espresso) | ⏳ |
+| v0.7.0 | `/reis-mobile:release` with quality gates | ⏳ |
 | v0.8.0 | MCP server | ⏳ |
 | v0.9.0 | Multi-provider (OpenAI, Gemini, OpenRouter, Ollama) beyond the debate's `--external` | ⏳ |
 | v1.0.0 | First stable version: Flutter, Android, iOS and React Native | ⏳ |
@@ -585,7 +416,7 @@ app: apps/mobile
 Every command then analyzes `apps/mobile`, wherever in the repository you run it, and the review diff is restricted to that folder. Without the file, run from the app folder or pass `--dir apps/mobile`.
 
 **Does it work with native Android and iOS?**
-Yes. Native Android has its own architect, performance and test agents, review and Gradle debugging skills, and the Android team's skills from `android/skills` (Compose, AGP 9, R8, Play policy, Wear, TV and more). Native iOS has its own agents and skills for review, Xcode and CocoaPods. React Native has architect, performance and test agents; its skills are still on the roadmap.
+Yes. Native Android, native iOS and React Native each have architect, performance and test agents, and the cross-platform skills — `mobile-debug`, `mobile-code-review`, `mobile-test` and `mobile-firebase` — have a guide for each of them (Gradle and R8, Xcode and CocoaPods, Metro and native modules). The platform skills `mobile-android`, `mobile-ios` and `mobile-rn` add what exists only on each stack; `mobile-android` includes the Android team's guides from `android/skills` (Compose, AGP 9, R8, Play policy, Wear, TV and more).
 
 **I already have skills with the same names in `~/.claude/skills`.**
 The plugin's skills live in the `reis-mobile:` namespace and do not conflict, but Claude Code loads both descriptions. To save context, remove the global copies the plugin already covers.
@@ -632,7 +463,7 @@ Questions: [Discussions](https://github.com/wrsilva/reis-mobile/discussions). Wh
 - **[flutter/skills](https://github.com/flutter/skills)** (BSD-3-Clause): 25 Flutter skills.
 - **[dart-lang/skills](https://github.com/dart-lang/skills)** (BSD-3-Clause): 8 Dart skills.
 - **[evanca/flutter-ai-rules](https://github.com/evanca/flutter-ai-rules)** (MIT): 28 Flutter, testing and Firebase skills.
-- **[OWASP MASVS](https://mas.owasp.org/MASVS/)**: categories used in the `mobile-security-audit` skill.
+- **[OWASP MASVS](https://mas.owasp.org/MASVS/)**: categories used in the `mobile-security` skill.
 
 ---
 

package/THIRD_PARTY_NOTICES.md

@@ -2,15 +2,14 @@
 
 reis-mobile is distributed under the MIT License (see [LICENSE](LICENSE)). The skills listed below were derived from third-party projects and remain under their original licenses. Each of these skills declares `source` and `license` in its `SKILL.md` frontmatter.
 
-Changes made by reis-mobile: routing metadata (`intents`, `stacks`, `routing`, `source`, `license`) added to the frontmatter, and skills renamed to start with the prefix of their stack (`flutter-`, `android-`, `ios-`, `rn-`, or `mobile-` for stack-agnostic skills). Each section lists the upstream name of every renamed skill; its folder and the `name` field changed, the instructions did not. Skills that exist on several platforms were consolidated into `mobile-*` skills (`mobile-test`, `mobile-firebase`): their instructions moved, unchanged apart from a leading attribution line and the removed frontmatter, into files under `skills/<skill>/references/`, as each section lists. Some copies correspond to earlier revisions of the upstream files.
+Changes made by reis-mobile: every third-party skill was moved into a reis-mobile skill (`mobile-test`, `mobile-firebase`, `mobile-code-review`, `mobile-debug`, `mobile-security`, `mobile-architecture`, `mobile-flutter`, `mobile-android`). Its instructions are unchanged apart from a leading attribution line and the removed frontmatter; skills that shipped extra files (references, scripts, examples) moved as whole folders with the instructions in `GUIDE.md`, so their relative links still work. Each section lists the upstream skill and the file that holds it now. Some copies correspond to earlier revisions of the upstream files.
 
 ## evanca/flutter-ai-rules
 
 - Source: https://github.com/evanca/flutter-ai-rules
 - License: MIT
-- Skills (10): `flutter-app-architecture`, `flutter-architecture-feature-first`, `flutter-bloc`, `flutter-change-notifier`, `flutter-code-review`, `flutter-dart-3-updates`, `flutter-effective-dart`, `flutter-errors`, `flutter-provider`, `flutter-riverpod`
-- Renamed by reis-mobile (upstream name → name here): `architecture-feature-first` → `flutter-architecture-feature-first`, `bloc` → `flutter-bloc`, `code-review` → `flutter-code-review`, `dart-3-updates` → `flutter-dart-3-updates`, `effective-dart` → `flutter-effective-dart`, `provider` → `flutter-provider`, `riverpod` → `flutter-riverpod`
-- Adapted into reis-mobile skills (upstream skill → file under `skills/`): `firebase-ai` → `mobile-firebase/references/flutter/ai-logic.md`, `firebase-analytics` → `mobile-firebase/references/flutter/analytics.md`, `firebase-app-check` → `mobile-firebase/references/flutter/app-check.md`, `firebase-auth` → `mobile-firebase/references/flutter/auth.md`, `firebase-crashlytics` → `mobile-firebase/references/flutter/crashlytics.md`, `firebase-cloud-firestore` → `mobile-firebase/references/flutter/firestore.md`, `firebase-cloud-functions` → `mobile-firebase/references/flutter/functions.md`, `firebase-in-app-messaging` → `mobile-firebase/references/flutter/in-app-messaging.md`, `firebase-messaging` → `mobile-firebase/references/flutter/messaging.md`, `firebase-database` → `mobile-firebase/references/flutter/realtime-database.md`, `firebase-remote-config` → `mobile-firebase/references/flutter/remote-config.md`, `flutterfire-configure` → `mobile-firebase/references/flutter/setup-flutterfire.md`, `firebase-data-connect` → `mobile-firebase/references/flutter/sql-connect.md`, `firebase-storage` → `mobile-firebase/references/flutter/storage.md`, `mockito` → `mobile-test/references/flutter/mockito.md`, `mocktail` → `mobile-test/references/flutter/mocktail.md`, `patrol-e2e-testing` → `mobile-test/references/flutter/patrol.md`, `testing` → `mobile-test/references/flutter/testing-guidelines.md`
+- Skills (0): none as standalone skills; all of its content lives in the files listed below
+- Adapted into reis-mobile skills (upstream skill → file under `skills/`): `flutter-app-architecture` → `mobile-architecture/references/flutter/app-architecture.md`, `bloc` → `mobile-architecture/references/flutter/bloc.md`, `flutter-change-notifier` → `mobile-architecture/references/flutter/change-notifier.md`, `architecture-feature-first` → `mobile-architecture/references/flutter/feature-first.md`, `provider` → `mobile-architecture/references/flutter/provider.md`, `riverpod` → `mobile-architecture/references/flutter/riverpod.md`, `code-review` → `mobile-code-review/references/flutter/pr-review.md`, `flutter-errors` → `mobile-debug/references/flutter/errors.md`, `firebase-ai` → `mobile-firebase/references/flutter/ai-logic.md`, `firebase-analytics` → `mobile-firebase/references/flutter/analytics.md`, `firebase-app-check` → `mobile-firebase/references/flutter/app-check.md`, `firebase-auth` → `mobile-firebase/references/flutter/auth.md`, `firebase-crashlytics` → `mobile-firebase/references/flutter/crashlytics.md`, `firebase-cloud-firestore` → `mobile-firebase/references/flutter/firestore.md`, `firebase-cloud-functions` → `mobile-firebase/references/flutter/functions.md`, `firebase-in-app-messaging` → `mobile-firebase/references/flutter/in-app-messaging.md`, `firebase-messaging` → `mobile-firebase/references/flutter/messaging.md`, `firebase-database` → `mobile-firebase/references/flutter/realtime-database.md`, `firebase-remote-config` → `mobile-firebase/references/flutter/remote-config.md`, `flutterfire-configure` → `mobile-firebase/references/flutter/setup-flutterfire.md`, `firebase-data-connect` → `mobile-firebase/references/flutter/sql-connect.md`, `firebase-storage` → `mobile-firebase/references/flutter/storage.md`, `dart-3-updates` → `mobile-flutter/references/dart/dart-3.md`, `effective-dart` → `mobile-flutter/references/dart/effective-dart.md`, `mockito` → `mobile-test/references/flutter/mockito.md`, `mocktail` → `mobile-test/references/flutter/mocktail.md`, `patrol-e2e-testing` → `mobile-test/references/flutter/patrol.md`, `testing` → `mobile-test/references/flutter/testing-guidelines.md`
 
 ```text
 MIT License
@@ -40,9 +39,8 @@ SOFTWARE.
 
 - Source: https://github.com/dart-lang/skills
 - License: BSD-3-Clause
-- Skills (4): `flutter-dart-fix-runtime-errors`, `flutter-dart-resolve-package-conflicts`, `flutter-dart-run-static-analysis`, `flutter-dart-use-pattern-matching`
-- Renamed by reis-mobile (upstream name → name here): `dart-fix-runtime-errors` → `flutter-dart-fix-runtime-errors`, `dart-resolve-package-conflicts` → `flutter-dart-resolve-package-conflicts`, `dart-run-static-analysis` → `flutter-dart-run-static-analysis`, `dart-use-pattern-matching` → `flutter-dart-use-pattern-matching`
-- Adapted into reis-mobile skills (upstream skill → file under `skills/`): `dart-collect-coverage` → `mobile-test/references/flutter/coverage.md`, `dart-generate-test-mocks` → `mobile-test/references/flutter/generate-mocks.md`, `dart-migrate-to-checks-package` → `mobile-test/references/flutter/migrate-to-checks.md`, `dart-add-unit-test` → `mobile-test/references/flutter/unit-tests.md`
+- Skills (0): none as standalone skills; all of its content lives in the files listed below
+- Adapted into reis-mobile skills (upstream skill → file under `skills/`): `dart-run-static-analysis` → `mobile-code-review/references/flutter/static-analysis.md`, `dart-resolve-package-conflicts` → `mobile-debug/references/flutter/package-conflicts.md`, `dart-fix-runtime-errors` → `mobile-debug/references/flutter/runtime-errors.md`, `dart-use-pattern-matching` → `mobile-flutter/references/dart/pattern-matching/GUIDE.md`, `dart-collect-coverage` → `mobile-test/references/flutter/coverage.md`, `dart-generate-test-mocks` → `mobile-test/references/flutter/generate-mocks.md`, `dart-migrate-to-checks-package` → `mobile-test/references/flutter/migrate-to-checks.md`, `dart-add-unit-test` → `mobile-test/references/flutter/unit-tests.md`
 
 ```text
 Copyright 2012, the Dart project authors.
@@ -77,8 +75,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 - Source: https://github.com/flutter/skills
 - License: BSD-3-Clause
-- Skills (23): `flutter-add-widget-preview`, `flutter-adding-home-screen-widgets`, `flutter-animating-apps`, `flutter-apply-architecture-best-practices`, `flutter-build-responsive-layout`, `flutter-building-forms`, `flutter-building-layouts`, `flutter-building-plugins`, `flutter-caching-data`, `flutter-embedding-native-views`, `flutter-fix-layout-issues`, `flutter-handling-concurrency`, `flutter-implement-json-serialization`, `flutter-improving-accessibility`, `flutter-interoperating-with-native-apis`, `flutter-managing-state`, `flutter-reducing-app-size`, `flutter-setting-up-on-macos`, `flutter-setup-declarative-routing`, `flutter-setup-localization`, `flutter-theming-apps`, `flutter-use-http-package`, `flutter-working-with-databases`
-- Adapted into reis-mobile skills (upstream skill → file under `skills/`): `flutter-add-integration-test` → `mobile-test/references/flutter/integration-tests.md`, `flutter-add-widget-test` → `mobile-test/references/flutter/widget-tests.md`
+- Skills (0): none as standalone skills; all of its content lives in the files listed below
+- Adapted into reis-mobile skills (upstream skill → file under `skills/`): `flutter-managing-state` → `mobile-architecture/references/flutter/managing-state.md`, `flutter-apply-architecture-best-practices` → `mobile-architecture/references/flutter/recommended-architecture.md`, `flutter-fix-layout-issues` → `mobile-debug/references/flutter/layout-issues.md`, `flutter-improving-accessibility` → `mobile-flutter/references/accessibility-i18n/accessibility.md`, `flutter-setup-localization` → `mobile-flutter/references/accessibility-i18n/localization.md`, `flutter-caching-data` → `mobile-flutter/references/data/caching.md`, `flutter-working-with-databases` → `mobile-flutter/references/data/databases.md`, `flutter-use-http-package` → `mobile-flutter/references/data/http.md`, `flutter-implement-json-serialization` → `mobile-flutter/references/data/json-serialization.md`, `flutter-interoperating-with-native-apis` → `mobile-flutter/references/native/native-apis.md`, `flutter-embedding-native-views` → `mobile-flutter/references/native/native-views.md`, `flutter-building-plugins` → `mobile-flutter/references/native/plugins.md`, `flutter-reducing-app-size` → `mobile-flutter/references/performance/app-size.md`, `flutter-handling-concurrency` → `mobile-flutter/references/performance/concurrency.md`, `flutter-setting-up-on-macos` → `mobile-flutter/references/setup/macos.md`, `flutter-animating-apps` → `mobile-flutter/references/ui/animations.md`, `flutter-building-forms` → `mobile-flutter/references/ui/forms.md`, `flutter-adding-home-screen-widgets` → `mobile-flutter/references/ui/home-screen-widgets.md`, `flutter-building-layouts` → `mobile-flutter/references/ui/layouts.md`, `flutter-build-responsive-layout` → `mobile-flutter/references/ui/responsive-layout.md`, `flutter-setup-declarative-routing` → `mobile-flutter/references/ui/routing.md`, `flutter-theming-apps` → `mobile-flutter/references/ui/theming.md`, `flutter-add-widget-preview` → `mobile-flutter/references/ui/widget-previews.md`, `flutter-add-integration-test` → `mobile-test/references/flutter/integration-tests.md`, `flutter-add-widget-test` → `mobile-test/references/flutter/widget-tests.md`
 
 ```text
 Copyright 2026 The Flutter Authors. All rights reserved.
@@ -114,10 +112,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - Source: https://github.com/android/skills
 - Revision: `466e1b5c5beb86cde9d35c81c2ffd26c6aef0502` (2026-09-15)
 - License: Apache-2.0
-- Skills (23): `android-adaptive`, `android-agp-9-upgrade`, `android-appfunctions`, `android-camerax`, `android-cli`, `android-display-glasses-with-jetpack-compose-glimmer`, `android-edge-to-edge`, `android-engage-sdk-integration`, `android-intent-security`, `android-leanback-to-compose-tv-migration`, `android-media3-cast-integration`, `android-migrate-xml-views-to-jetpack-compose`, `android-ml-kit-genai-prompt-api`, `android-navigation-3`, `android-navigation-event`, `android-play-billing-library-version-upgrade`, `android-play-policy-insights`, `android-profiler`, `android-r8-analyzer`, `android-restore-credentials`, `android-styles`, `android-verified-email`, `android-wear-compose-m3`
-- Renamed by reis-mobile (upstream name → name here): `adaptive` → `android-adaptive`, `agp-9-upgrade` → `android-agp-9-upgrade`, `appfunctions` → `android-appfunctions`, `camerax` → `android-camerax`, `display-glasses-with-jetpack-compose-glimmer` → `android-display-glasses-with-jetpack-compose-glimmer`, `edge-to-edge` → `android-edge-to-edge`, `engage-sdk-integration` → `android-engage-sdk-integration`, `leanback-to-compose-tv-migration` → `android-leanback-to-compose-tv-migration`, `media3-cast-integration` → `android-media3-cast-integration`, `migrate-xml-views-to-jetpack-compose` → `android-migrate-xml-views-to-jetpack-compose`, `ml-kit-genai-prompt-api` → `android-ml-kit-genai-prompt-api`, `navigation-3` → `android-navigation-3`, `navigation-event` → `android-navigation-event`, `play-billing-library-version-upgrade` → `android-play-billing-library-version-upgrade`, `play-policy-insights` → `android-play-policy-insights`, `r8-analyzer` → `android-r8-analyzer`, `restore-credentials` → `android-restore-credentials`, `styles` → `android-styles`, `verified-email` → `android-verified-email`, `wear-compose-m3` → `android-wear-compose-m3`
-- Adapted into reis-mobile skills (upstream skill → file under `skills/`): `testing-setup` → `mobile-test/references/android/setup/GUIDE.md`
-- Changes made by reis-mobile: each skill folder was moved from its category path (for example `performance/r8-analyzer/`) to `skills/<name>/` and renamed with the `android-` prefix where it did not have it; in each `SKILL.md` frontmatter, `license: Complete terms in LICENSE.txt` was replaced by `license: Apache-2.0` and `source`, `stacks` and `intents` or `routing` were added. The instructions, references, resources and scripts are unchanged.
+- Skills (0): none as standalone skills; all of its content lives in the files listed below
+- Adapted into reis-mobile skills (upstream skill → file under `skills/`): `agp-9-upgrade` → `mobile-android/references/build-and-performance/agp-9-upgrade/GUIDE.md`, `android-cli` → `mobile-android/references/build-and-performance/android-cli/GUIDE.md`, `android-profiler` → `mobile-android/references/build-and-performance/android-profiler/GUIDE.md`, `r8-analyzer` → `mobile-android/references/build-and-performance/r8-analyzer/GUIDE.md`, `display-glasses-with-jetpack-compose-glimmer` → `mobile-android/references/devices/display-glasses-with-jetpack-compose-glimmer/GUIDE.md`, `leanback-to-compose-tv-migration` → `mobile-android/references/devices/leanback-to-compose-tv-migration/GUIDE.md`, `wear-compose-m3` → `mobile-android/references/devices/wear-compose-m3/GUIDE.md`, `restore-credentials` → `mobile-android/references/identity/restore-credentials/GUIDE.md`, `verified-email` → `mobile-android/references/identity/verified-email/GUIDE.md`, `camerax` → `mobile-android/references/media/camerax/GUIDE.md`, `media3-cast-integration` → `mobile-android/references/media/media3-cast-integration/GUIDE.md`, `appfunctions` → `mobile-android/references/on-device-ai/appfunctions/GUIDE.md`, `ml-kit-genai-prompt-api` → `mobile-android/references/on-device-ai/ml-kit-genai-prompt-api/GUIDE.md`, `engage-sdk-integration` → `mobile-android/references/play/engage-sdk-integration/GUIDE.md`, `play-billing-library-version-upgrade` → `mobile-android/references/play/play-billing-library-version-upgrade/GUIDE.md`, `play-policy-insights` → `mobile-android/references/play/play-policy-insights/GUIDE.md`, `adaptive` → `mobile-android/references/ui/adaptive/GUIDE.md`, `edge-to-edge` → `mobile-android/references/ui/edge-to-edge/GUIDE.md`, `migrate-xml-views-to-jetpack-compose` → `mobile-android/references/ui/migrate-xml-views-to-jetpack-compose/GUIDE.md`, `navigation-3` → `mobile-android/references/ui/navigation-3/GUIDE.md`, `navigation-event` → `mobile-android/references/ui/navigation-event/GUIDE.md`, `styles` → `mobile-android/references/ui/styles/GUIDE.md`, `android-intent-security` → `mobile-security/references/android/intent-security.md`, `testing-setup` → `mobile-test/references/android/setup/GUIDE.md`
+- Changes made by reis-mobile: each skill folder was moved from its category path (for example `performance/r8-analyzer/`) into `skills/mobile-android/references/<topic>/<skill>/` (the testing and intent security skills into `mobile-test` and `mobile-security`), its `SKILL.md` renamed to `GUIDE.md` and its frontmatter replaced by an attribution line. The instructions, references, resources and scripts are unchanged.
 
 ```text
 

package/agents/android-performance-engineer.md

@@ -55,7 +55,7 @@ Your mission is to find and remove the bottlenecks users feel: dropped frames, A
 
 ### Background work, battery and size
 - Periodic or long work outside `WorkManager`, wakelocks held too long, polling instead of push
-- Release builds without R8 (`isMinifyEnabled`) and resource shrinking (`isShrinkResources`); keep rules that disable shrinking for whole packages (see the `android-r8-analyzer` skill)
+- Release builds without R8 (`isMinifyEnabled`) and resource shrinking (`isShrinkResources`); keep rules that disable shrinking for whole packages (see the R8 guide in the `mobile-android` skill)
 
 Confirm the AGP, Kotlin and Compose versions in the build files before recommending APIs or compiler options that depend on them.
 
@@ -67,7 +67,7 @@ Confirm the AGP, Kotlin and Compose versions in the build files before recommend
 4. Check resource ownership and cancellation for leaks.
 5. Review release build configuration for size.
 
-Prefer measurements over inference when they exist: Android Studio profilers, Perfetto traces, Macrobenchmark results, Play Console vitals. The `android-profiler` skill covers recording traces. Say which findings are inferred from code only.
+Prefer measurements over inference when they exist: Android Studio profilers, Perfetto traces, Macrobenchmark results, Play Console vitals. The `mobile-android` skill's profiler guide covers recording and analyzing traces. Say which findings are inferred from code only.
 
 ## Output
 

package/agents/mobile-code-reviewer.md

@@ -16,6 +16,8 @@ You are a senior mobile engineer doing code review. Your job is to find what bre
 - **Project audit.** There are no changes. Prioritize the entry points (`main.dart`, `Application`/`MainActivity`, `AppDelegate`/`@main`, `App.tsx`), the data layer, authentication and the most complex screens.
 - **Called via /reis-mobile:review.** The command has already detected the stack and loaded the skills. Follow their checklists; do not redo the detection.
 
+The `mobile-code-review` skill holds the review process and a checklist per platform (`references/flutter.md`, `android.md`, `ios.md`, `react-native.md`); read the one for the project's stack.
+
 ## Process
 
 1. Confirm the stack and the target platforms (use the router result when available).

package/agents/rn-architect.md

@@ -62,7 +62,7 @@ src/
 - Native modules called directly from many places instead of one wrapper
 
 **Configuration**
-- Secrets in `.env` files bundled into the app (see `mobile-security-audit`)
+- Secrets in `.env` files bundled into the app (see `mobile-security`)
 - Missing or loose TypeScript settings (`strict` off) in a codebase that relies on types
 
 ## Process

package/commands/debug.md

@@ -37,7 +37,7 @@ The CLI output has a `Language` line. Write everything the user reads in that la
 Read with the Read tool, in this order:
 
 1. `${CLAUDE_PLUGIN_ROOT}/agents/<Agent>.md`;
-2. `${CLAUDE_PLUGIN_ROOT}/skills/<skill>/SKILL.md` for each listed skill. The first skills are the most specific to the stack and area; read them all, since a failure often crosses layers (a Flutter build that fails inside Gradle).
+2. `${CLAUDE_PLUGIN_ROOT}/skills/<skill>/SKILL.md` for each listed skill. `mobile-debug` maps the stack and the `area` from step 1 to its platform references; read the reference for each layer the failure crosses (a Flutter build that fails inside Gradle needs the Flutter and the Android references).
 
 ## 3. Diagnose
 

package/core/registry/registry.mjs

@@ -8,14 +8,15 @@ import { parseFrontmatter } from './frontmatter.mjs';
 
 export const ANY_STACK = '*';
 
-/** Every skill name starts with the prefix of the first stack it declares. */
-export const SKILL_PREFIXES = {
-  [ANY_STACK]: ['mobile-'],
-  flutter: ['flutter-'],
-  android: ['android-'],
-  ios: ['ios-'],
-  'react-native': ['rn-'],
-  'kotlin-multiplatform': ['kmp-'],
+/**
+ * Every skill starts with `mobile-`. A topic skill covers every stack (`stacks: ["*"]`) with a
+ * reference per platform; a platform skill is named after the one stack it covers.
+ */
+export const PLATFORM_SKILLS = {
+  'mobile-flutter': 'flutter',
+  'mobile-android': 'android',
+  'mobile-ios': 'ios',
+  'mobile-rn': 'react-native',
 };
 
 /**
@@ -119,9 +120,15 @@ export function validateRegistry({ stacks, agents, skills }) {
 
     if (component.source && !component.license) errors.push(`${label}: "source" requires "license"`);
 
-    const prefixes = component.kind === 'skill' ? SKILL_PREFIXES[component.stacks[0]] : undefined;
-    if (prefixes && component.name && !prefixes.some((prefix) => component.name.startsWith(prefix))) {
-      errors.push(`${label}: skill name must start with "${prefixes.join('" or "')}" for stack "${component.stacks[0]}"`);
+    if (component.kind === 'skill' && component.name) {
+      const platform = PLATFORM_SKILLS[component.name];
+      if (!component.name.startsWith('mobile-')) {
+        errors.push(`${label}: skill name must start with "mobile-"`);
+      } else if (platform && !(component.stacks.length === 1 && component.stacks[0] === platform)) {
+        errors.push(`${label}: platform skill ${component.name} must declare stacks: [${platform}]`);
+      } else if (!platform && !(component.stacks.length === 1 && component.stacks[0] === ANY_STACK)) {
+        errors.push(`${label}: topic skill must declare stacks: ["*"], or be one of ${Object.keys(PLATFORM_SKILLS).join(', ')}`);
+      }
     }
 
     for (const intent of component.intents) {