@cometchat/skills 4.2.1 → 4.4.0

package/skills/cometchat-flutter-v6-migration/SKILL.md

@@ -8,14 +8,15 @@ description: >
   Also use when seeing imports from cometchat_calls_uikit, get/get.dart, or v5-era patterns
   like GetBuilder, Get.put, Get.find, PageManager, BuilderSettings, or CometChatCallingExtension.
 license: "MIT"
-compatibility: "cometchat_chat_uikit 6.0.0-beta2"
-allowed-tools: "shell, file-read, file-search, file-list, grep"
+compatibility: "cometchat_chat_uikit 6.0.1"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat flutter migration v5 v6 getx removal upgrade consumer"
 ---
 
+> **Ground truth:** `cometchat_chat_uikit: ^6.0` — pub-cache source + `ui-kit/flutter`. **Official docs:** https://www.cometchat.com/docs/ui-kit/flutter/overview · **Docs MCP:** `claude mcp add --transport http cometchat-docs https://www.cometchat.com/docs/mcp` (or fetch the URL directly without MCP). Verify symbols against the installed package/source before relying on them.
+
 # CometChat Flutter — v5 to v6 Migration
 
 Complete guide for migrating a consumer app from UIKit v5 to v6.
@@ -28,7 +29,7 @@ Complete guide for migrating a consumer app from UIKit v5 to v6.
 | State | GetX (`Get.put`, `GetBuilder`, `Obx`, `.obs`, `RxBool`) | Plain `StatefulWidget` + `setState()` |
 | Navigation | `PageManager` (GetxController singleton) | Direct `Navigator.push` |
 | Init | `InitializeCometChat.init()` + `CometChatCallingExtension()` + `extensions` + `aiFeature` | Inline `CometChatUIKit.init()` + `enableCalls: true` + `CallingConfiguration()` |
-| Calls SDK init | `CometChatCallingExtension()` in extensions list | `CallEventService.instance.init()` after login |
+| Calls SDK init | `CometChatCallingExtension()` in extensions list | Automatic via `..enableCalls = true` on `UIKitSettingsBuilder` (kit auto-invokes `CallEventService` internally on both fresh login and cached-session restore; no manual init required) |
 | Screens | Separate controller + widget files per screen | Single file, state in StatefulWidget |
 | Dashboard | `MyHomePage`/`MyPageView` with GetX `PageManager` | `HomeScreen` with `IndexedStack` |
 | Messages | `MessagesSample` + `CometChatMessagesController` | `MessagesScreen` with listener mixins |
@@ -36,7 +37,7 @@ Complete guide for migrating a consumer app from UIKit v5 to v6.
 | Notifications | `VoipNotificationHandler`, `APNSService` | `VoipCallHandler`, `ApnsService` |
 | Extra deps | `get`, `google_sign_in`, `firebase_auth`, `bugsee_flutter`, `shared_preferences`, `toast`, `mobile_scanner`, `app_badge_plus` | None of these |
 | Localization | `cc.Translations.delegate` + `GlobalMaterialLocalizations` in MaterialApp | Handled by UIKit internally |
-| Call screen | `callMain()` entry point + `CallApp` + `CallScreen` widget | `CometChatOngoingCall` widget for the in-call UI + `CometChatDisplayIncomingCallOverlay` for incoming-call presentation. No separate Dart entry point. |
+| Call screen | `callMain()` entry point + `CallApp` + `CallScreen` widget | `CometChatOngoingCall` widget for the in-call UI + the kit's `IncomingCallOverlay` (imperative singleton automatically invoked by `CallEventService` when `enableCalls = true` — do NOT mount it manually). No separate Dart entry point. |
 | Android minSdk | 24 | 26 (required by `cometchat_calls_sdk`) |
 
 ## Step 1: pubspec.yaml
@@ -58,11 +59,10 @@ dependencies:
   mobile_scanner: ^7.1.2
   app_badge_plus: ^1.2.6
 
-# ✅ v6
+# ✅ v6 — GA is on pub.dev; use a plain dependency (NOT a Cloudsmith `hosted:` stanza,
+#         which only carries the pre-GA 6.0.0-beta* builds and fails version solving for ^6.0.x).
 dependencies:
-  cometchat_chat_uikit:
-    hosted: https://dart.cloudsmith.io/cometchat/cometchat/
-    version: 6.0.0-beta2
+  cometchat_chat_uikit: ^6.0.1   # resolves 6.0.1/6.0.2/6.0.3 from pub.dev
   firebase_core: ^3.9.0
   firebase_crashlytics: ^4.1.3
   firebase_messaging: ^15.1.6
@@ -120,17 +120,7 @@ CometChatUIKit.init(uiKitSettings: settings, onSuccess: (_) { ... });
 
 ### Calls SDK Init for Cached Sessions
 
-```dart
-// ❌ v5 — CometChatCallingExtension handled it automatically
-
-// ✅ v6 — explicit init needed when restoring cached session (no login call)
-Future<void> _initCallsSdk() async {
-  await CallEventService.instance.init(
-    configuration: CallingConfiguration(),
-  );
-}
-// Call after checking getLoggedInUser() returns non-null
-```
+With `..enableCalls = true` on `UIKitSettingsBuilder`, the kit invokes `CallEventService.instance.init(...)` automatically for BOTH fresh logins AND cached-session restores (verified in `cometchat_chat_uikit-6.0.1/lib/shared_ui/src/cometchat_ui_kit/cometchat_ui_kit.dart` lines 170–179 — `_initiateAfterLogin()` is called from both `CometChatUIKit.init` cached-user branch and `CometChatUIKit.login`). No manual `CallEventService.instance.init()` call is required or recommended.
 
 ## Step 4: Remove GetX
 
@@ -290,7 +280,7 @@ MaterialApp(
 )
 ```
 
-Remove the `callMain()` entry point and `CallApp`/`CallScreen` widget entirely. V6 renders the in-call UI via the `CometChatOngoingCall` widget (placed in your widget tree once the call is active) and presents incoming calls via `CometChatDisplayIncomingCallOverlay`. There is no `CallScreenOverlay.show()` API.
+Remove the `callMain()` entry point and `CallApp`/`CallScreen` widget entirely. V6 renders the in-call UI via the `CometChatOngoingCall` widget (placed in your widget tree once the call is active) and presents incoming calls via the `IncomingCallOverlay` widget. (The kit DOES expose `CallScreenOverlay.show(...)` — `call_ui/src/ongoing_call/call_screen_overlay.dart` — which it uses internally for the outgoing→in-call transition.)
 
 ## Step 8: Update Notification Services
 
@@ -313,12 +303,15 @@ await VoipCallHandler.instance.markSdkReady();  // after login
 ## Step 9: resizeToAvoidBottomInset
 
 ```dart
-// ❌ v5 — default true, SafeArea wrapping
+// ❌ v5 — SafeArea wrapping around the composer
 Scaffold(body: SafeArea(child: Column(children: [messageList, composer])))
 
-// ✅ v6 — must be false, composer handles keyboard internally
+// ✅ v6 on ^6.0.1 — true (or omit; true is the default). The composer clamps
+//   the keyboard height to viewInsets (kit fix ENG-34434), so true does NOT
+//   double-compensate. (false was only the pre-6.0.1 workaround — if you still
+//   see a double keyboard gap, upgrade the kit.)
 Scaffold(
-  resizeToAvoidBottomInset: false,
+  resizeToAvoidBottomInset: true,
   body: Column(children: [Expanded(child: messageList), composer]),
 )
 ```
@@ -356,7 +349,7 @@ android.enableJetifier=true  // Required for support library conflicts
 - `CallSettingsBuilder` is renamed to `SessionSettingsBuilder` with different API: `.setLayout(LayoutType.tile)` instead of `..enableDefaultLayout = true`.
 - v6 `CometChatMessageList` doesn't have `messageId` param — use `goToMessageId` instead.
 - `CometChatBannedMembers`, `CometChatCallLogParticipants`, `CometChatCallLogRecordings`, `CometChatCallLogHistory` are not exported as standalone widgets in v6.
-- The `callMain()` entry point pattern (separate Dart entry point for Android CallActivity) is gone. V6 renders the in-call UI via the `CometChatOngoingCall` widget within your existing app navigator + `CometChatDisplayIncomingCallOverlay` for incoming-call UI.
+- The `callMain()` entry point pattern (separate Dart entry point for Android CallActivity) is gone. V6 renders the in-call UI via the `CometChatOngoingCall` widget within your existing app navigator + the `IncomingCallOverlay` widget for incoming-call UI.
 - `FormatPatterns.stripFormatting()` doesn't exist in v6. Use `MarkdownTextFormatter` instead.
 
 ## Checklist
@@ -374,7 +367,7 @@ android.enableJetifier=true  // Required for support library conflicts
 - [ ] Update `MaterialApp` — remove localization delegates, remove `BuilderTypography`
 - [ ] Remove `callMain()` entry point and `CallScreen` widget
 - [ ] `CallSettingsBuilder` → `SessionSettingsBuilder`
-- [ ] `resizeToAvoidBottomInset: false` on all Scaffolds with composer
+- [ ] `resizeToAvoidBottomInset: true` (or omitted) on Scaffolds with composer on `^6.0.1` — composer clamps to `viewInsets` (ENG-34434); `false` is only the pre-6.0.1 stopgap
 - [ ] Android `minSdk` = 26
 - [ ] Android `enableJetifier = true`
 - [ ] Delete all unused v5 files

package/skills/cometchat-flutter-v6-placement/SKILL.md

@@ -9,14 +9,15 @@ description: >
   "tab bar with chat", "chat in modal", "chat in drawer", "embedded chat",
   "Scaffold layout", or "keyboard handling".
 license: "MIT"
-compatibility: "cometchat_chat_uikit ^6.0.0-beta2; flutter >=2.5.0"
-allowed-tools: "shell, file-read, file-search, file-list, grep"
+compatibility: "cometchat_chat_uikit ^6.0.1; flutter >=2.5.0"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat flutter placement route modal drawer tabs scaffold keyboard layout"
 ---
 
+> **Ground truth:** `cometchat_chat_uikit: ^6.0` widgets + `docs/ui-kit/flutter`. **Official docs:** https://www.cometchat.com/docs/ui-kit/flutter/overview · **Docs MCP:** `claude mcp add --transport http cometchat-docs https://www.cometchat.com/docs/mcp` (or fetch the URL directly without MCP). Verify symbols against the installed package/source before relying on them.
+
 # CometChat Flutter UIKit — Placement
 
 WHERE to put CometChat in your Flutter app. Five patterns, each with complete code.
@@ -144,20 +145,24 @@ class _MessagesScreenState extends State<MessagesScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final colorPalette = CometChatThemeHelper.getColorPalette(context);
     return Scaffold(
-      resizeToAvoidBottomInset: false, // REQUIRED — composer handles keyboard
+      resizeToAvoidBottomInset: true, // matches sample app; composer clamps to viewInsets (ENG-34434)
       appBar: CometChatMessageHeader(
         user: _user,
         group: _group,
         onBack: () => Navigator.pop(context),
       ),
       body: SafeArea(
-        bottom: false, // Composer handles bottom safe area
-        child: Column(
-          children: [
-            Expanded(child: CometChatMessageList(user: _user, group: _group)),
-            CometChatMessageComposer(user: _user, group: _group),
-          ],
+        top: false, // Header is the appBar — top inset already handled; keep bottom inset
+        child: Container(
+          color: colorPalette.background3,
+          child: Column(
+            children: [
+              Expanded(child: CometChatMessageList(user: _user, group: _group)),
+              CometChatMessageComposer(user: _user, group: _group),
+            ],
+          ),
         ),
       ),
     );
@@ -167,8 +172,8 @@ class _MessagesScreenState extends State<MessagesScreen> {
 
 ### Critical Scaffold Rules
 
-1. `resizeToAvoidBottomInset: false` — MANDATORY on any Scaffold with `CometChatMessageComposer`. The composer uses `SliverSpacing` internally to handle keyboard. Setting `true` causes double-compensation.
-2. `SafeArea(bottom: false)` — The composer handles bottom safe area internally.
+1. `resizeToAvoidBottomInset: true` (or omit — `true` is the Scaffold default) — matches the kit sample app (`messages_screen.dart` defaults it; `thread_screen.dart` sets it `true`). The composer clamps the native keyboard height to Flutter's `viewInsets` (kit fix ENG-34434), so `true` does NOT double-compensate on `^6.0.1`. (Pre-6.0.1 kits double-compensated with `true`; `false` was the old workaround — if you see a double keyboard gap, upgrade the kit.)
+2. `SafeArea(top: false)` wrapping `Container(color: colorPalette.background3, ...)` — the header is the `appBar`, so the top inset is already handled; keep the bottom inset. The `background3` container gives the list/composer the correct surface color.
 3. Mutable `_user`/`_group` — Keep mutable copies in State, not `widget.user`/`widget.group`. Update from SDK listeners for block/kick/scope changes.
 
 ---
@@ -191,33 +196,41 @@ class ThreadScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final colorPalette = CometChatThemeHelper.getColorPalette(context);
     return Scaffold(
-      resizeToAvoidBottomInset: false, // REQUIRED — same rule as messages
+      resizeToAvoidBottomInset: true, // same as messages screen
       appBar: CometChatMessageHeader(
         user: user, group: group,
         onBack: () => Navigator.pop(context),
       ),
       body: SafeArea(
-        bottom: false,
-        child: Column(
-          children: [
-            CometChatThreadedHeader(
-              parentMessage: message,
-              loggedInUser: CometChatUIKit.loggedInUser!,
-              template: template,
-            ),
-            Expanded(
-              child: CometChatMessageList(
+        child: Container(
+          color: colorPalette.background3,
+          child: Column(
+            children: [
+              CometChatThreadedHeader(
+                parentMessage: message,
+                loggedInUser: CometChatUIKit.loggedInUser!,
+                template: template,
+              ),
+              Expanded(
+                child: CometChatMessageList(
+                  user: user, group: group,
+                  parentMessageId: message.id,
+                  // Scope the list to this thread only: exclude the parent and
+                  // request just the replies for message.id.
+                  withParent: false,
+                  messagesRequestBuilder: MessagesRequestBuilder()
+                    ..parentMessageId = message.id,
+                  hideReplyInThreadOption: true,
+                ),
+              ),
+              CometChatMessageComposer(
                 user: user, group: group,
                 parentMessageId: message.id,
-                hideReplyInThreadOption: true,
               ),
-            ),
-            CometChatMessageComposer(
-              user: user, group: group,
-              parentMessageId: message.id,
-            ),
-          ],
+            ],
+          ),
         ),
       ),
     );
@@ -254,7 +267,7 @@ void _openChatModal(BuildContext context, User user) {
     builder: (_) => SizedBox(
       height: MediaQuery.sizeOf(context).height * 0.85,
       child: Scaffold(
-        resizeToAvoidBottomInset: false, // Still required!
+        resizeToAvoidBottomInset: true, // same rule applies to the inner Scaffold
         appBar: CometChatMessageHeader(
           user: user,
           onBack: () => Navigator.pop(context),
@@ -274,7 +287,7 @@ void _openChatModal(BuildContext context, User user) {
 **Key details:**
 - `isScrollControlled: true` — allows the sheet to be taller than half screen
 - `useSafeArea: true` — respects notch/status bar
-- Inner `Scaffold` still needs `resizeToAvoidBottomInset: false`
+- Inner `Scaffold` uses `resizeToAvoidBottomInset: true` (same as the messages screen)
 - Use `MediaQuery.sizeOf(context)` not `MediaQuery.of(context).size`
 
 ---
@@ -291,7 +304,7 @@ class SplitView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      resizeToAvoidBottomInset: false,
+      resizeToAvoidBottomInset: true,
       body: Row(
         children: [
           // Left: your app content
@@ -332,32 +345,48 @@ Scaffold(
 
 ## Incoming Calls — Global Placement
 
-Incoming call handling MUST be at the app root level, not per-screen. Use `VoipCallHandler` or mount the call overlay in `MaterialApp.builder`:
+Incoming call handling MUST be at the app root level, not per-screen. **`VoipCallHandler` does NOT exist as a public symbol** (it appears only in comments inside `call_event_service.dart` and `ongoing_call_bloc.dart`). The canonical V6 root-mount API is `CometChatUIKit.init` + `MaterialApp(navigatorKey: CallNavigationContext.navigatorKey)`:
 
 ```dart
-// In main.dart — before runApp
-VoipCallHandler.instance.init();
-
-// Or in MaterialApp builder for overlay approach
-MaterialApp(
-  builder: (context, child) {
-    return Stack(children: [
-      child!,
-      // Global incoming call overlay
-    ]);
-  },
-)
+import 'package:cometchat_chat_uikit/cometchat_calls_uikit.dart' show CallNavigationContext;
+import 'package:cometchat_chat_uikit/cometchat_chat_uikit.dart';
+
+void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+  await CometChatUIKit.init(
+    uiKitSettings: (UIKitSettingsBuilder()
+      ..appId = APP_ID
+      ..region = REGION
+      ..authKey = AUTH_KEY
+      ..subscriptionType = CometChatSubscriptionType.allUsers
+      ..enableCalls = true)
+      .build(),
+  );
+  runApp(MyApp());
+}
+
+class MyApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      navigatorKey: CallNavigationContext.navigatorKey, // ← Bug 1 fix per project_v6_flutter_calls_partial; even 6.0.1 sample omits this
+      home: HomeScreen(),
+    );
+  }
+}
 ```
 
+See `cometchat-flutter-v6-calls` §1.7 for full root-mount details. CallEventService mounts `IncomingCallOverlay` automatically when `enableCalls=true`.
+
 ---
 
 ## Anti-Patterns
 
 ```dart
-// ❌ WRONG — resizeToAvoidBottomInset not set (defaults to true)
+// ❌ WRONG — CometChatMessageList not wrapped in Expanded (unbounded → won't scroll)
 Scaffold(
   body: Column(children: [
-    Expanded(child: CometChatMessageList(user: user)),
+    CometChatMessageList(user: user),   // needs Expanded inside a Column
     CometChatMessageComposer(user: user),
   ]),
 )
@@ -387,12 +416,12 @@ onItemTap: (conv) {
 
 ## Checklist
 
-- [ ] `resizeToAvoidBottomInset: false` on every Scaffold with `CometChatMessageComposer`
-- [ ] `SafeArea(bottom: false)` when using composer (it handles safe area internally)
+- [ ] `resizeToAvoidBottomInset: true` (or omitted — default) on Scaffolds with `CometChatMessageComposer`
+- [ ] `SafeArea(top: false)` wrapping `Container(color: colorPalette.background3, ...)` for the message screen body
 - [ ] Mutable `_user`/`_group` state copies, not `widget.user`/`widget.group`
 - [ ] `onItemTap` extracts `User`/`Group` from `conversation.conversationWith`
 - [ ] Protected groups handled (check `group.hasJoined` and `group.type`)
 - [ ] Incoming call handler mounted at app root level
-- [ ] Thread screen also has `resizeToAvoidBottomInset: false`
+- [ ] Thread screen also uses `resizeToAvoidBottomInset: true`
 - [ ] `hideAppbar: true` when parent provides its own AppBar
 - [ ] `IndexedStack` used for tab-based home (preserves tab state)

package/skills/cometchat-flutter-v6-production/SKILL.md

@@ -6,14 +6,15 @@ description: >
   checklist, environment configuration, and security hardening. Use when preparing
   a CometChat Flutter app for production deployment.
 license: "MIT"
-compatibility: "cometchat_chat_uikit ^6.0.0-beta2"
-allowed-tools: "shell, file-read, file-search, file-list, grep"
+compatibility: "cometchat_chat_uikit ^6.0.1"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat flutter production release auth-token proguard security"
 ---
 
+> **Ground truth:** `cometchat_chat_uikit: ^6.0` — pub-cache source + `ui-kit/flutter`. **Official docs:** https://www.cometchat.com/docs/fundamentals/user-auth · **Docs MCP:** `claude mcp add --transport http cometchat-docs https://www.cometchat.com/docs/mcp` (or fetch the URL directly without MCP). Verify symbols against the installed package/source before relying on them.
+
 # CometChat Flutter UIKit v6 — Production Readiness
 
 Everything you need to move a CometChat Flutter app from development to production. Covers authentication, platform configuration, environment management, and security hardening.
@@ -99,9 +100,8 @@ await CometChatUIKit.loginWithAuthToken(authToken,
 Your server calls the CometChat REST API with the `authKey` (which stays server-side):
 
 ```bash
-curl -X POST "https://API_REGION.cometchat.io/v3/users/USER_UID/auth_tokens" \
-  -H "appId: YOUR_APP_ID" \
-  -H "apiKey: YOUR_AUTH_KEY" \
+curl -X POST "https://<APP_ID>.api-<REGION>.cometchat.io/v3/users/<UID>/auth_tokens" \
+  -H "apikey: YOUR_REST_API_KEY" \
   -H "Content-Type: application/json"
 ```
 
@@ -116,10 +116,12 @@ Response:
 }
 ```
 
-Replace `API_REGION` with your region endpoint:
-- US: `api-us.cometchat.io`
-- EU: `api-eu.cometchat.io`
-- IN: `api-in.cometchat.io`
+Replace `<APP_ID>` with your CometChat app ID and `<REGION>` with your region code (`us`, `eu`, or `in`). The full host becomes:
+- US: `<APP_ID>.api-us.cometchat.io`
+- EU: `<APP_ID>.api-eu.cometchat.io`
+- IN: `<APP_ID>.api-in.cometchat.io`
+
+Use `YOUR_REST_API_KEY` from the CometChat dashboard (API & Auth Keys). Do not confuse it with the client `authKey`.
 
 ### Step 2: Your Backend Returns the Token to the Client
 
@@ -195,9 +197,8 @@ await CometChatUIKit.updateUser(user,
 
 Server-side user creation:
 ```bash
-curl -X POST "https://API_REGION.cometchat.io/v3/users" \
-  -H "appId: YOUR_APP_ID" \
-  -H "apiKey: YOUR_AUTH_KEY" \
+curl -X POST "https://<APP_ID>.api-<REGION>.cometchat.io/v3/users" \
+  -H "apikey: YOUR_REST_API_KEY" \
   -H "Content-Type: application/json" \
   -d '{"uid": "user_123", "name": "Jane Doe"}'
 ```

package/skills/cometchat-flutter-v6-push/SKILL.md

@@ -1,9 +1,8 @@
 ---
 name: cometchat-flutter-v6-push
-description: Push notifications for CometChat Flutter UIKit v6 (beta, Bloc-based). Covers firebase_messaging setup for FCM (Android) + APNs (iOS via Firebase), CometChat dashboard PushPlatform configuration, token registration via the Notifications SDK, background isolate handler (Dart entry-point rule), foreground vs background message routing, notification tap deep-link to chat threads, and the Bloc patterns for surfacing push state. Sister skill of cometchat-flutter-v5-push — same FCM stack, Bloc-flavored client integration.
+description: Push notifications for CometChat Flutter UIKit v6 (stable, Bloc-based). Covers firebase_messaging setup for FCM (Android) + APNs (iOS via Firebase), CometChat dashboard PushPlatform configuration, token registration via the Notifications SDK, background isolate handler (Dart entry-point rule), foreground vs background message routing, notification tap deep-link to chat threads, and the Bloc patterns for surfacing push state. Sister skill of cometchat-flutter-v5-push — same FCM stack, Bloc-flavored client integration.
 license: "MIT"
-compatibility: "Flutter >= 2.5, Dart >= 3.0; cometchat_chat_uikit ^6.0.0-beta2; firebase_messaging ^14.0.0; firebase_core ^2.0.0; Android minSdk 26+; iOS 13+ deployment target"
-allowed-tools: "shell, file-read, file-search, file-list, ask-user"
+compatibility: "Flutter >= 2.5, Dart >= 3.0; cometchat_chat_uikit ^6.0.1; firebase_messaging ^14.0.0; firebase_core ^2.0.0; Android minSdk 26+; iOS 13+ deployment target"
 metadata:
   author: "CometChat"
   version: "4.0.0"
@@ -12,9 +11,9 @@ metadata:
 
 ## Purpose
 
-Push notifications for Flutter v6 (beta). Notifies users on incoming messages when the app is backgrounded or terminated. Two components: **Firebase Messaging** (FCM on Android, APNs forwarded via Firebase on iOS) on the client, plus **CometChat dashboard PushPlatform** configured to forward CometChat's webhook to Firebase.
+Push notifications for Flutter v6 (stable, GA 2026-05-25). Notifies users on incoming messages when the app is backgrounded or terminated. Two components: **Firebase Messaging** (FCM on Android, APNs forwarded via Firebase on iOS) on the client, plus **CometChat dashboard PushPlatform** configured to forward CometChat's webhook to Firebase.
 
-This skill is for **chat push** (new messages). Calls/VoIP push has different mechanics — see `cometchat-flutter-v6-calls/references/voip-push-end-to-end.md` (or the relevant section of `cometchat-flutter-v6-calls/SKILL.md` rule 1.2).
+This skill is for **chat push** (new messages). Calls/VoIP push has different mechanics — see `cometchat-flutter-v6-calls/SKILL.md` §1.2 (VoIP push — `native_call_kit` + FCM + PushKit) and its `references/server-push-bridge.md`.
 
 **Read these other skills first:**
 - `cometchat-flutter-v6-core` — UIKitSettings, init/login order
@@ -56,7 +55,7 @@ Unlike Web Push (which requires you to run a push server), CometChat hosts the c
 dependencies:
   flutter:
     sdk: flutter
-  cometchat_chat_uikit: ^6.0.0-beta2
+  cometchat_chat_uikit: ^6.0
   firebase_messaging: ^14.0.0
   firebase_core: ^2.0.0
   flutter_local_notifications: ^16.0.0    # for foreground notifications + iOS in-app banner
@@ -203,24 +202,47 @@ class PushService {
   }
 
   Future<void> _registerWithCometChat(String token, {required TargetPlatform platform}) async {
-    // Audit 2026-05-14: the canonical SDK method is `PNRegistry.registerPNService`,
-    // NOT `CometChatNotifications.registerPushToken` (which was cited in earlier
-    // drafts of this doc but doesn't exist on the installed SDK).
-    // Source: https://www.cometchat.com/docs/notifications/flutter-push-notifications-android.md
+    // Canonical SDK source: chat-sdk-flutter/lib/notification/main/cometchat_notifications.dart
+    // (registerPushToken lines 36-235, unregisterPushToken lines 246-261).
     //
-    // The provider ID (FCM vs APN) is pulled from `AppCredentials.fcmProviderId`
-    // (or the APN equivalent) at registration time — you don't pass it directly.
-    PNRegistry.registerPNService(token, true, false);
+    // The kit's only public push surface is CometChatNotifications.registerPushToken /
+    // unregisterPushToken — named-arg signature. PNRegistry seen in the vendor docs is
+    // a sample-app extension (cometchat-uikit-flutter sample_app_push_notifications),
+    // NOT a kit-exported symbol — copying it as-is into a customer project fails to
+    // compile with "Undefined name 'PNRegistry'".
+    //
+    // Provider ID comes from the dashboard's Notifications → Push → Provider ID config;
+    // customers typically store it as a const (AppCredentials.fcmProviderId pattern).
+    final pushPlatform = platform == TargetPlatform.android
+        ? PushPlatforms.FCM_FLUTTER_ANDROID
+        : PushPlatforms.FCM_FLUTTER_IOS;   // iOS via Firebase (FCM relay).
+                                            // For pure APNs chat:  PushPlatforms.APNS_FLUTTER_DEVICE + deviceToken: <APNs token>
+                                            // For VoIP/CallKit:    PushPlatforms.APNS_FLUTTER_VOIP   + voipToken:   <PushKit token>
+                                            //   See cometchat-flutter-v6-calls for VoIP plumbing.
+
+    await CometChatNotifications.registerPushToken(
+      pushPlatform,
+      fcmToken: token,
+      providerId: AppCredentials.fcmProviderId, // your dashboard PushPlatform provider ID
+      onSuccess: (resp) => debugPrint('CometChat push registered: $resp'),
+      onError: (CometChatException e) => debugPrint('CometChat push register failed: ${e.message}'),
+    );
   }
 
   Future<void> _unregisterWithCometChat(String token) async {
-    // Same `PNRegistry` namespace — pass `false` as the second arg to unregister.
-    PNRegistry.registerPNService(token, false, false);
+    // Distinct method on CometChatNotifications (chat-sdk-flutter lines 246-261).
+    // No token arg required — the SDK resolves the registration by the logged-in user's identity.
+    await CometChatNotifications.unregisterPushToken(
+      onSuccess: (_) => debugPrint('CometChat push unregistered'),
+      onError: (CometChatException e) => debugPrint('CometChat push unregister failed: ${e.message}'),
+    );
   }
 }
 ```
 
-**Audit 2026-05-14** — the symbols are `PNRegistry.registerPNService(token, register, additionalFlag)`. Earlier drafts of this doc cited `CometChatNotifications.registerPushToken` / `unregisterPushToken` — those don't exist. Confirmed against the vendor docs at `https://www.cometchat.com/docs/notifications/flutter-push-notifications-android.md`. If you've copied the old symbols into your code, they will not compile.
+**Symbol note (2026-06-03, reversing 2026-05-14):** The kit's only public push surface is `CometChatNotifications.registerPushToken` / `unregisterPushToken` — verified in `chat-sdk-flutter/lib/notification/main/cometchat_notifications.dart` and cross-verified against the V5 sister skill (`cometchat-flutter-v5-push`) and the replit-template canonical skill. `PNRegistry.registerPNService` is a v5-sample-app extension (lives in `cometchat-uikit-flutter/sample_app_push_notifications/`, defined as `extension PNRegistry on CometChatService`) — it is NOT exported by any `cometchat_*` pub package. The previous 2026-05-14 audit treated a docs page that cites the sample-app helper as SDK ground truth; that audit has been reversed.
+
+**Signature:** `CometChatNotifications.registerPushToken` is **named-arg only**: `(PushPlatforms platform, {String? fcmToken, String? deviceToken, String? voipToken, String? providerId, Function(String)? onSuccess, Function(CometChatException)? onError})`. The positional `(token, true, false)` shape from the v5 sample-app helper does not type-check against the SDK.
 
 ---
 
@@ -243,7 +265,7 @@ class _MyAppState extends State<MyApp> {
   }
 
   Future<void> _initCometChat() async {
-    final settings = (UIKitSettings.builder()
+    final settings = (UIKitSettingsBuilder()
       ..appId = CometChatConfig.appId
       ..region = CometChatConfig.region
       ..authKey = CometChatConfig.authKey)
@@ -400,9 +422,9 @@ If migrating from v5:
 |---|---|---|
 | Listener pattern | GetX `Get.put` for push handlers | Bloc — handlers in app shell or a NotificationBloc |
 | Init lifecycle | `CometChatUIKit.init` callback | Same shape — `onSuccess` / `onError` |
-| Token registration API | Verify against installed `cometchat_chat_uikit` | Same — likely renamed; verify |
+| Token registration API | `CometChatNotifications.registerPushToken(platform, {fcmToken, deviceToken, voipToken, providerId, onSuccess, onError})` | Same — namespace and signature unchanged in V6 chat-sdk-flutter; only the surrounding state-mgmt wiring differs (Bloc instead of GetX) |
 | Background handler | `@pragma('vm:entry-point')` required | Unchanged — Flutter framework requirement |
-| Calls VoIP push interaction | `cometchat_calls_uikit ^5` separate package | Calls bundled into `cometchat_chat_uikit ^6.0.0-beta2`; VoIP push handled in `cometchat-flutter-v6-calls` references |
+| Calls VoIP push interaction | `cometchat_calls_uikit ^5` separate package | Calls bundled into `cometchat_chat_uikit ^6.0.1`; VoIP push handled in `cometchat-flutter-v6-calls` references |
 
 The migration is small for push specifically — the FCM/firebase_messaging stack is unchanged; the deltas are in the surrounding architecture.
 
@@ -433,7 +455,7 @@ The migration is small for push specifically — the FCM/firebase_messaging stac
 - [ ] Android manifest: `POST_NOTIFICATIONS` permission + notification channel meta-data
 - [ ] Background handler is top-level + `@pragma('vm:entry-point')`
 - [ ] Background handler initialized via `FirebaseMessaging.onBackgroundMessage` BEFORE `runApp`
-- [ ] FCM/APN token registered with CometChat via `PNRegistry.registerPNService(token, true, false)` AFTER login (NOT `CometChatNotifications.registerPushToken` — that symbol doesn't exist; audit 2026-05-14)
+- [ ] FCM/APN token registered with CometChat via `CometChatNotifications.registerPushToken(PushPlatforms.FCM_FLUTTER_ANDROID, fcmToken: token, providerId: ..., onSuccess: ..., onError: ...)` (or `PushPlatforms.FCM_FLUTTER_IOS` / `APNS_FLUTTER_DEVICE` + `deviceToken:` / `APNS_FLUTTER_VOIP` + `voipToken:` equivalent) AFTER login resolves. `PNRegistry` in the vendor docs is a v5-sample-app extension, not a kit API.
 - [ ] `onTokenRefresh` re-registers
 - [ ] Foreground handler decides banner vs no-banner based on chat tab focus
 - [ ] `onMessageOpenedApp` + `getInitialMessage` both navigate to the conversation
@@ -446,7 +468,7 @@ The migration is small for push specifically — the FCM/firebase_messaging stac
 ## 12. Pointers
 
 - `cometchat-flutter-v5-push` — V5/GetX sister skill (FCM stack unchanged; client wiring different)
-- `cometchat-flutter-v6-calls/references/voip-push-end-to-end.md` — calls VoIP push (overlap; both can coexist)
+- `cometchat-flutter-v6-calls` SKILL.md §1.2 + `references/server-push-bridge.md` — calls VoIP push (overlap; both can coexist)
 - `cometchat-flutter-v6-core` — UIKitSettings, init/login order
 - `cometchat-flutter-v6-troubleshooting` — push debugging (token never registers, background handler doesn't fire, FCM payload not received)
 - `cometchat-flutter-v6-migration` — full V5→V6 migration recipe; push delta is one section

package/skills/cometchat-flutter-v6-testing/SKILL.md

@@ -1,9 +1,8 @@
 ---
 name: cometchat-flutter-v6-testing
-description: Testing patterns for CometChat Flutter UIKit v6 (beta, Bloc-based). Covers flutter_test + bloc_test for Bloc unit tests, mocktail for SDK mocking, widget tests around the Bloc-driven CometChat widgets, integration_test for real-device flows, golden tests for theming, and CI on GitHub Actions / Codemagic. Sister skill of cometchat-flutter-v5-testing — the cohorts have different state-management primitives (GetX vs Bloc) so the patterns differ.
+description: Testing patterns for CometChat Flutter UIKit v6 (stable, Bloc-based). Covers flutter_test + bloc_test for Bloc unit tests, mocktail for SDK mocking, widget tests around the Bloc-driven CometChat widgets, integration_test for real-device flows, golden tests for theming, and CI on GitHub Actions / Codemagic. Sister skill of cometchat-flutter-v5-testing — the cohorts have different state-management primitives (GetX vs Bloc) so the patterns differ.
 license: "MIT"
-compatibility: "Flutter >= 2.5, Dart >= 3.0; flutter_test (built-in); bloc_test >= 9.0; mocktail >= 1.0; integration_test (built-in); cometchat_chat_uikit ^6.0.0-beta2"
-allowed-tools: "shell, file-read, file-search, file-list, ask-user"
+compatibility: "Flutter >= 2.5, Dart >= 3.0; flutter_test (built-in); bloc_test >= 9.0; mocktail >= 1.0; integration_test (built-in); cometchat_chat_uikit ^6.0.2"
 metadata:
   author: "CometChat"
   version: "4.0.0"
@@ -12,14 +11,14 @@ metadata:
 
 ## Purpose
 
-Test recipes for Flutter UIKit v6 (beta, Bloc-based). Most of the v5 patterns carry over; the deltas are around state-management primitives (Bloc, not GetX) and the unified `cometchat_chat_uikit` package (calls bundled — see `cometchat-flutter-v6-calls`).
+Test recipes for Flutter UIKit v6 (stable, Bloc-based). Most of the v5 patterns carry over; the deltas are around state-management primitives (Bloc, not GetX) and the unified `cometchat_chat_uikit` package (calls bundled — see `cometchat-flutter-v6-calls`).
 
 **Read these other skills first:**
 - `cometchat-flutter-v6-core` — UIKitSettings, init/login order, hard rules
 - `cometchat-flutter-v6-events` — Bloc-based event streams
 - `cometchat-flutter-v5-testing` — patterns that aren't v6-specific (CI config, golden tests, mocktail intro) — read first if you haven't
 
-**Ground truth:**
+**Ground truth:** **Official docs:** https://www.cometchat.com/docs/ui-kit/flutter/overview · **Docs MCP:** `claude mcp add --transport http cometchat-docs https://www.cometchat.com/docs/mcp` (or fetch the URL directly without MCP).
 - bloc_test — https://pub.dev/packages/bloc_test
 - flutter_bloc — https://bloclibrary.dev/
 
@@ -70,7 +69,8 @@ abstract class CometChatService {
 class CometChatServiceImpl implements CometChatService {
   @override
   Future<void> init() async {
-    final settings = (UIKitSettings.builder()
+    // Class is UIKitSettingsBuilder (constructor), NOT UIKitSettings.builder() (verified shared_uikit/lib/src/cometchat_ui_kit/ui_kit_settings.dart).
+    final settings = (UIKitSettingsBuilder()
       ..appId = CometChatConfig.appId
       ..region = CometChatConfig.region
       ..authKey = CometChatConfig.authKey