@cometchat/skills 4.2.1 → 4.4.0

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

@@ -1,9 +1,8 @@
 ---
 name: cometchat-android-v6-migration
-description: V5→V6 migration recipes for native Android. CometChat ships V5 (chat-uikit-android:5.x — Java + Kotlin Views) and V6 beta (chatuikit-{compose,kotlin}-android:6.x — Compose surface OR Kotlin Views, calls bundled) side-by-side. Covers when to migrate vs stay, the cohort-selection decision (Compose vs Kotlin Views on V6), gradle dependency rewrites, builder API changes (UIKitSettings replaces UIKitSettingsBuilder), theme system rewrite (CometChatTheme.DayNight), calls integration delta (calls bundled — drop calls-sdk-android), Activity theme rules, side-by-side cohort selection during migration, and a verification checklist.
+description: V5→V6 migration recipes for native Android. CometChat ships V5 (chat-uikit-android:5.x — Java + Kotlin Views) and V6 (chatuikit-{compose,kotlin}-android:6.x — GA 2026-05-25 — Compose surface OR Kotlin Views, calls bundled) side-by-side. Covers when to migrate vs stay, the cohort-selection decision (Compose vs Kotlin Views on V6), gradle dependency rewrites, builder API changes (UIKitSettings replaces UIKitSettingsBuilder), theme system rewrite (CometChatTheme.DayNight), calls integration delta (calling UI bundled, but calls-sdk-android:5.0.+ is still a required peer dep), Activity theme rules, side-by-side cohort selection during migration, and a verification checklist.
 license: "MIT"
-compatibility: "Migrating FROM com.cometchat:chat-uikit-android:5.x TO com.cometchat:chatuikit-{compose,kotlin}-android:6.0.0-beta2; minSdk 28+ (V6 raised the floor from 21 to 28); Kotlin >= 1.9 for V6 Compose"
-allowed-tools: "shell, file-read, file-search, file-list, ask-user"
+compatibility: "Migrating FROM com.cometchat:chat-uikit-android:5.x TO com.cometchat:chatuikit-{compose,kotlin}-android:6.0.+; minSdk 28+ (V6 raised the floor from 21 to 28); Kotlin >= 1.9 for V6 Compose"
 metadata:
   author: "CometChat"
   version: "4.0.0"
@@ -12,7 +11,7 @@ metadata:
 
 ## Purpose
 
-Migration recipes for moving from CometChat Android UIKit V5 (`chat-uikit-android:5.x`) to V6 (`chatuikit-{compose,kotlin}-android:6.0.0-beta2`). V6 is beta — most production apps should stay on V5 today; this skill is for teams evaluating V6 or planning the eventual migration.
+Migration recipes for moving from CometChat Android UIKit V5 (`chat-uikit-android:5.x`) to V6 (`chatuikit-{compose,kotlin}-android:6.0.+`). V6 is stable (GA 2026-05-25) and the recommended target for new apps; existing V5 apps can migrate when ready — there's no forced timeline, and V5 remains supported. This skill covers both the decision and the mechanics.
 
 V6 is a different SDK, not a drop-in replacement. The migration is roughly the size of jumping from React Native UIKit v5 to v6 — package coordinates, builder APIs, theme system, calls handling all change.
 
@@ -23,9 +22,9 @@ V6 is a different SDK, not a drop-in replacement. The migration is roughly the s
 - `cometchat-android-v6-{compose,kotlin}-{components,placement,theming,customization}` — surface-specific destination skills
 - `cometchat-android-v6-calls` — calls migration (calls SDK is bundled in V6)
 
-**Ground truth:**
+**Ground truth:** **Official docs:** https://www.cometchat.com/docs/ui-kit/android/v6/overview · **Docs MCP:** `claude mcp add --transport http cometchat-docs https://www.cometchat.com/docs/mcp` (or fetch the URL directly without MCP).
 - V5 source — installed `com.cometchat:chat-uikit-android@5.x` artifacts under `~/.gradle/caches/`
-- V6 source — installed `chatuikit-{compose,kotlin}-android@6.0.0-beta2` artifacts
+- V6 source — installed `chatuikit-{compose,kotlin}-android@6.0.+` artifacts
 - Sister skill — `cometchat-flutter-v6-migration` (different platform, same migration shape)
 
 ---
@@ -44,7 +43,7 @@ V6 is a different SDK, not a drop-in replacement. The migration is roughly the s
 - You're starting a new project
 - You're rewriting your existing app's UI to Compose anyway
 - You need V6 features that aren't backported to V5 (e.g. some AI Agent components)
-- You've validated V6 beta against your use cases on a sample project first
+- You've validated V6 against your use cases on a sample project first
 
 **The dispatcher (`cometchat-android-v6`) routes by detected version.** Both V5 and V6 skill sets ship in `npx @cometchat/skills add --family android` — the migration here lives under V6 because that's the destination cohort.
 
@@ -56,8 +55,8 @@ V6 is split into two surfaces:
 
 | Surface | Package | When to pick |
 |---|---|---|
-| Compose | `com.cometchat:chatuikit-compose-android:6.0.0-beta2` | New apps; existing apps already on Compose |
-| Kotlin Views | `com.cometchat:chatuikit-kotlin-android:6.0.0-beta2` | Existing apps on Java + XML layouts; teams not ready for Compose |
+| Compose | `com.cometchat:chatuikit-compose-android:6.0.+` | New apps; existing apps already on Compose |
+| Kotlin Views | `com.cometchat:chatuikit-kotlin-android:6.0.+` | Existing apps on Java + XML layouts; teams not ready for Compose |
 
 **You can mix both in the same app**, but a single chat surface is one or the other — not both.
 
@@ -81,7 +80,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-  implementation("com.cometchat:chatuikit-compose-android:6.0.0-beta2")
+  implementation("com.cometchat:chatuikit-compose-android:6.0.+")
   // No separate calls SDK — calls bundled into the same artifact
   // Compose dependencies (if not already present)
   implementation(platform("androidx.compose:compose-bom:2024.02.00"))
@@ -95,7 +94,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-  implementation("com.cometchat:chatuikit-kotlin-android:6.0.0-beta2")
+  implementation("com.cometchat:chatuikit-kotlin-android:6.0.+")
   // No separate calls SDK
   // Material Components for theming (`CometChatTheme.DayNight` extends Material themes)
   implementation("com.google.android.material:material:1.11.+")
@@ -135,30 +134,28 @@ CometChatUIKit.init(this, settings, object : CometChat.CallbackListener<String>(
 })
 ```
 
-### V6 — `UIKitSettings.Builder()`
+### V6 — `UIKitSettings.UIKitSettingsBuilder()`
 
 ```kotlin
-val settings = UIKitSettings.Builder()
+val settings = UIKitSettings.UIKitSettingsBuilder()
   .setAppId(BuildConfig.COMETCHAT_APP_ID)
   .setRegion(BuildConfig.COMETCHAT_REGION)
   .setAuthKey(BuildConfig.COMETCHAT_AUTH_KEY)
   .subscribePresenceForAllUsers()
-  .enableCalling()                                // ← calls toggled on here, not via separate SDK
+  .setEnableCalling(true)                         // ← calls toggled on here, not via separate SDK
   .build()
 
-CometChatUIKit.init(this, settings) { result ->
-  when (result) {
-    is CometChatUIKit.Result.Success -> { /* ... */ }
-    is CometChatUIKit.Result.Error   -> { /* surface to UI */ }
-  }
-}
+CometChatUIKit.init(this, settings, object : CometChat.CallbackListener<String>() {
+  override fun onSuccess(result: String) { /* ... */ }
+  override fun onError(e: CometChatException) { /* surface to UI */ }
+})
 ```
 
 Differences:
 
-- Class name: `UIKitSettingsBuilder` → `UIKitSettings.Builder()`
-- Calls: separate SDK init → `.enableCalling()` flag
-- Result: `CallbackListener` → `Result.Success` / `Result.Error` sealed class
+- Builder: unchanged — both V5 and V6 use `UIKitSettings.UIKitSettingsBuilder()` (nested class)
+- Calls: separate SDK init → `.setEnableCalling(true)` flag on the builder
+- Result handling: unchanged — `init()`/`login()` still take `CometChat.CallbackListener<T>` (onSuccess/onError). There is **no** `Result.Success`/`Result.Error` sealed class in V6.
 
 For full builder option mapping, see `cometchat-android-v6-builder-settings`.
 
@@ -166,7 +163,7 @@ For full builder option mapping, see `cometchat-android-v6-builder-settings`.
 
 ## 5. Calls integration migration
 
-V5 has a separate `calls-sdk-android` artifact + a separate `CometChatCalls.init`. V6 bundles calls into `chatuikit-{compose,kotlin}-android` and toggles via `.enableCalling()`.
+V5 has a separate `calls-sdk-android` artifact + a separate `CometChatCalls.init`. V6 bundles calls into `chatuikit-{compose,kotlin}-android` and toggles via `.setEnableCalling(true)`.
 
 ### V5 calls init
 
@@ -184,12 +181,17 @@ CometChatCalls.init(this, callAppSettings, /* callback */)
 ### V6 calls init
 
 ```kotlin
-val settings = UIKitSettings.Builder()
+val settings = UIKitSettings.UIKitSettingsBuilder()
   // ... appId, region, authKey ...
-  .enableCalling()              // ← that's it; calls SDK init happens internally
+  .setEnableCalling(true)              // ← that's it; calls SDK init happens internally
   .build()
 
-CometChatUIKit.init(this, settings) { /* ... */ }
+// init takes a CometChat.CallbackListener<String> (an abstract class — NOT a
+// fun interface), so use the object form, not a trailing lambda.
+CometChatUIKit.init(this, settings, object : CometChat.CallbackListener<String>() {
+  override fun onSuccess(result: String) { /* ready */ }
+  override fun onError(e: CometChatException) { /* handle */ }
+})
 ```
 
 ### Permissions + manifest carry over
@@ -255,7 +257,7 @@ This is documented in `cometchat-android-v6-troubleshooting` and surfaced in the
 1. Audit V5 theme attrs (`grep cometchat res/values/`)
 2. Map each to its V6 equivalent (most are same names; some have been renamed for Material 3 alignment)
 3. Activity manifest: change `android:theme="@style/Theme.AppCompat.*"` → `android:theme="@style/Theme.YourApp"` where the new theme inherits `CometChatTheme.DayNight`
-4. Programmatic theme overrides: rewrite via Compose `CometChatTheme(colorScheme = ...)` or Kotlin Views `CometChatTheme.singleton.colors.primary = ...` (depending on surface)
+4. Programmatic theme overrides: rewrite via Compose `CometChatTheme(colorScheme = ...)` or Kotlin Views `CometChatTheme.setPrimaryColor(...)` (the `CometChatTheme` object exposes `setPrimaryColor`/`setExtendedPrimaryColor*`/`setNeutralColor*` etc. — there is no `.singleton.colors` field; depends on surface)
 
 For full mapping, see `cometchat-android-v6-{compose,kotlin}-theming`.
 
@@ -275,24 +277,24 @@ import com.cometchat.chatuikit.messages.CometChatMessageList
 ### V6 Compose imports
 
 ```kotlin
-import com.cometchat.chatuikit.compose.conversations.CometChatConversations
-import com.cometchat.chatuikit.compose.messages.CometChatMessageList
+import com.cometchat.uikit.compose.presentation.conversations.ui.CometChatConversations
+import com.cometchat.uikit.compose.presentation.messagelist.ui.CometChatMessageList
 ```
 
 ### V6 Kotlin Views imports
 
 ```kotlin
-import com.cometchat.chatuikit.kotlin.conversations.CometChatConversations
-import com.cometchat.chatuikit.kotlin.messages.CometChatMessageList
+import com.cometchat.uikit.kotlin.presentation.conversations.ui.CometChatConversations
+import com.cometchat.uikit.kotlin.presentation.messagelist.ui.CometChatMessageList
 ```
 
-The skill rewrites imports during migration. Most projects can do a regex sweep:
+The skill rewrites imports during migration. The V6 namespace is `com.cometchat.uikit.{compose,kotlin}.presentation.<feature>.ui` — NOT the V5 `com.cometchat.chatuikit.*`. Most projects can do a regex sweep:
 
 ```bash
 # Compose path
-sed -i 's|com.cometchat.chatuikit.conversations|com.cometchat.chatuikit.compose.conversations|g' app/src/main/kotlin/**/*.kt
+sed -i -E 's|com.cometchat.chatuikit.([a-z]+)|com.cometchat.uikit.compose.presentation.\1.ui|g' app/src/main/kotlin/**/*.kt
 # Kotlin Views path
-sed -i 's|com.cometchat.chatuikit.conversations|com.cometchat.chatuikit.kotlin.conversations|g' app/src/main/kotlin/**/*.kt
+sed -i -E 's|com.cometchat.chatuikit.([a-z]+)|com.cometchat.uikit.kotlin.presentation.\1.ui|g' app/src/main/kotlin/**/*.kt
 ```
 
 But verify each rewrite — some V5 modules have been split or merged in V6 in ways the agent should review case-by-case.
@@ -326,14 +328,14 @@ For an in-progress migration, you can have V5 and V6 in the same module temporar
 
 □ Update gradle
   □ Remove chat-uikit-android:5.x
-  □ KEEP calls-sdk-android:5.0.+ (V6 needs it as peer dep — see §"Drop the calls-sdk-android dependency" above)
-  □ Add chatuikit-{compose,kotlin}-android:6.0.0-beta2
+  □ KEEP calls-sdk-android:5.0.+ (V6 needs it as peer dep — see §"KEEP calls-sdk-android:5.0.+" above)
+  □ Add chatuikit-{compose,kotlin}-android:6.0.+
   □ Add Compose deps (if applicable) or Material Components (if Kotlin Views)
 
 □ Rewrite init
-  □ UIKitSettingsBuilder → UIKitSettings.Builder()
-  □ Drop separate CometChatCalls.init; add .enableCalling() on UIKitSettings
-  □ CallbackListener → Result sealed class
+  □ UIKitSettingsBuilder → UIKitSettings.UIKitSettingsBuilder()
+  □ Drop separate CometChatCalls.init; add .setEnableCalling(true) on UIKitSettings
+  □ init callback stays CometChat.CallbackListener<String> (V6 did NOT switch to a Result/sealed-class API)
 
 □ Rewrite themes
   □ Activity theme parent → CometChatTheme.DayNight (Kotlin Views)
@@ -379,8 +381,8 @@ For an in-progress migration, you can have V5 and V6 in the same module temporar
 - [ ] `app/build.gradle.kts` has only one CometChat dep tree (V5 OR V6, not both)
 - [ ] `minSdk = 28` or higher
 - [ ] All V5 imports rewritten to the V6 surface (`compose` or `kotlin` namespace)
-- [ ] `UIKitSettingsBuilder` → `UIKitSettings.Builder()` everywhere
-- [ ] `.enableCalling()` on the builder if calls are used
+- [ ] `UIKitSettingsBuilder` → `UIKitSettings.UIKitSettingsBuilder()` everywhere
+- [ ] `.setEnableCalling(true)` on the builder if calls are used
 - [ ] Activity themes inherit `CometChatTheme.DayNight` (Kotlin Views path)
 - [ ] No `CometChatCalls.init` calls outside what V6 does internally
 - [ ] `calls-sdk-android:5.0.+` retained as explicit peer dep (V6 needs it; despite vendor marketing of "bundled calls")

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

@@ -3,13 +3,14 @@ name: cometchat-android-v6-production
 description: "CometChat Android UIKit v6 production readiness — token auth, ProGuard/R8, security checklist, release configuration"
 license: "MIT"
 compatibility: "Android 9.0+ (API 28); Kotlin 1.9+; com.cometchat:chatuikit-compose-android:6.x / com.cometchat:chatuikit-kotlin-android:6.x"
-allowed-tools: "shell, file-read, file-search, file-list"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat, android, production, security, proguard, release, auth-token"
 ---
 
+> **Ground truth:** `com.cometchat:chatuikit-{compose,kotlin}-android:6.x` (+ `calls-sdk-android:5.x`) — resolved AAR (javap) + `ui-kit/android/v6`. **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.
+
 > **Companion skills:** cometchat-android-v6-core (init/login), cometchat-android-v6-builder-settings (UIKitSettings), cometchat-android-v6-push (FCM)
 
 ## Purpose
@@ -165,11 +166,13 @@ implementation("androidx.compose.material3:material3")
 Pin CometChat SDK versions explicitly:
 
 ```kotlin
-implementation("com.cometchat:chatuikit-compose-android:6.0.0-beta2")
+implementation("com.cometchat:chatuikit-compose-android:6.0.+")
 // or
-implementation("com.cometchat:chatuikit-kotlin-android:6.0.0-beta2")
+implementation("com.cometchat:chatuikit-kotlin-android:6.0.+")
 ```
 
+> Never pin `6.0.0-beta2` (or any `-beta` preview) in a production build — V6 went GA on 2026-05-25. The `6.0.+` dynamic pin tracks GA patches forward (ENG-35701). Pin an exact GA patch (e.g. `6.0.1`) if your release process requires reproducible builds.
+
 ## 6. minSdk 28 Implications
 
 v6 requires `minSdk = 28` (Android 9.0 Pie). This means:

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

@@ -3,13 +3,14 @@ name: cometchat-android-v6-push
 description: "CometChat Android UIKit v6 push notifications — FCM setup, chat/call notification handling, VoIP integration, and deep-linking"
 license: "MIT"
 compatibility: "Android 9.0+ (API 28); Kotlin 1.9+; com.cometchat:chatuikit-compose-android:6.x / com.cometchat:chatuikit-kotlin-android:6.x"
-allowed-tools: "shell, file-read, file-search, file-list"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat, android, push, fcm, firebase, voip, notifications, calls"
 ---
 
+> **Ground truth:** `com.cometchat:chatuikit-{compose,kotlin}-android:6.x` (+ `calls-sdk-android:5.x`) — resolved AAR (javap) + `ui-kit/android/v6`. **Official docs:** https://www.cometchat.com/docs/notifications/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.
+
 > **Companion skills:** cometchat-android-v6-core (init/login), cometchat-android-v6-events (call events), cometchat-android-v6-builder-settings (calling config)
 
 ## Purpose
@@ -58,9 +59,49 @@ Add `google-services.json` to your app module's root directory.
 FirebaseApp.initializeApp(this)
 ```
 
+### 1.3 Register / unregister the push token (the kit's ONLY public push API)
+
+This is the single load-bearing client step. `CometChatNotifications.registerPushToken(...)` binds the FCM token to the logged-in CometChat user; `unregisterPushToken(...)` clears it. The Android `PushPlatforms` constant is **`FCM_ANDROID`** (verified in `com.cometchat.chat.enums.PushPlatforms` — the only Android value). Everything in §2 onward is sample-app glue you control; *this* is the real API.
+
+```kotlin
+import com.cometchat.chat.core.CometChatNotifications
+import com.cometchat.chat.enums.PushPlatforms
+import com.cometchat.chat.exceptions.CometChatException
+import com.google.firebase.messaging.FirebaseMessaging
+
+// Call AFTER CometChatUIKit.login(...) resolves (a token registered before
+// login is not bound to a user). Also call from FCMService.onNewToken when a
+// session already exists (token rotation).
+fun registerPushToken() {
+    FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
+        if (!task.isSuccessful) return@addOnCompleteListener
+        CometChatNotifications.registerPushToken(
+            task.result,
+            PushPlatforms.FCM_ANDROID,
+            "YOUR_PROVIDER_ID",  // FCM Provider ID from the CometChat dashboard (§4 setup)
+            object : CometChat.CallbackListener<String>() {
+                override fun onSuccess(s: String?) { /* registered */ }
+                override fun onError(e: CometChatException) { /* log + retry */ }
+            }
+        )
+    }
+}
+
+// Call BEFORE CometChatUIKit.logout() — otherwise the logged-out device keeps
+// receiving pushes for the previous user.
+fun unregisterPushToken(onDone: () -> Unit) {
+    CometChatNotifications.unregisterPushToken(object : CometChat.CallbackListener<String>() {
+        override fun onSuccess(s: String?) { onDone() }
+        override fun onError(e: CometChatException) { onDone() } // proceed with logout regardless
+    })
+}
+```
+
+Lifecycle: **register after login resolves** (and on `onNewToken` when a session exists), **unregister before logout**. This mirrors the verified `cometchat-android-v5-push` pattern — the registration API is identical across v5/v6 (it lives in the Chat SDK, not the UI Kit).
+
 ## 2. FCMService Implementation
 
-> **Heads-up — this is a reference pattern.** The classes referenced below (`CometChatVoIP`, `CometChatVoIPConnectionService`, `FCMMessageDTO`, `FCMCallDto`, `FCMService`, `VoIPPermissionListener`, `CometChatVoIPUtils`, `FCMMessageNotificationUtils`) are NOT exported from `com.cometchat:chatuikit-{compose,kotlin}-android:6.x`. They live in the `master-app-jetpack` sample app — copy the relevant source files into your project, or use them as a guide for writing your own equivalents. The kit's only public push surface is `CometChatNotifications.registerPushToken(...)` / `unregisterPushToken(...)`; everything below is glue you control.
+> **Heads-up — this is a reference pattern.** The classes referenced below (`CometChatVoIP`, `CometChatVoIPConnectionService`, `FCMMessageDTO`, `FCMCallDto`, `FCMService`, `VoIPPermissionListener`, `CometChatVoIPUtils`, `FCMMessageNotificationUtils`) are NOT exported from `com.cometchat:chatuikit-{compose,kotlin}-android:6.x`. They are sample-app glue (derived from the CometChat Android push sample app — note: not present in the v6 kit clone, so treat them as a copy-in/reference pattern) — copy the relevant source files into your project, or use them as a guide for writing your own equivalents. The kit's only public push surface is `CometChatNotifications.registerPushToken(...)` / `unregisterPushToken(...)`; everything below is glue you control.
 
 Pattern from `master-app-jetpack/fcm/FCMService.kt` (sample-app code, copy into your project):
 

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

@@ -3,13 +3,14 @@ name: cometchat-android-v6-testing
 description: "CometChat Android UIKit v6 testing — unit testing ViewModels, Compose UI testing, Espresso, Maestro, and CI configuration"
 license: "MIT"
 compatibility: "Android 9.0+ (API 28); Kotlin 1.9+; com.cometchat:chatuikit-compose-android:6.x / com.cometchat:chatuikit-kotlin-android:6.x"
-allowed-tools: "shell, file-read, file-search, file-list"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat, android, testing, junit, kotest, compose-testing, espresso, maestro"
 ---
 
+> **Ground truth:** `com.cometchat:chatuikit-{compose,kotlin}-android:6.x` (+ `calls-sdk-android:5.x`) — resolved AAR (javap) + `ui-kit/android/v6`. **Official docs:** https://www.cometchat.com/docs/ui-kit/android/v6/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.
+
 > **Companion skills:** cometchat-android-v6-extensions (ViewModel/DataSource architecture), cometchat-android-v6-compose-components, cometchat-android-v6-kotlin-components
 
 ## Purpose
@@ -111,7 +112,7 @@ fun `emitting message event is received by collector`() = runTest {
         CometChatEvents.messageEvents.collect { events.add(it) }
     }
 
-    CometChatEvents.emitMessageEventSync(
+    CometChatEvents.emitMessageEvent(
         CometChatMessageEvent.MessageSent(mockMessage, MessageStatus.SUCCESS)
     )
 
@@ -195,13 +196,15 @@ import io.kotest.property.forAll
 import io.kotest.property.Arb
 import io.kotest.property.arbitrary.string
 
-class BubbleFactoryKeyTest : FunSpec({
+class BubbleFactoryTest : FunSpec({
 
-    test("factory key format is always category_type") {
-        forAll(Arb.string(1..20), Arb.string(1..20)) { category, type ->
-            val key = BubbleFactory.getKey(category, type)
-            key == "${category}_${type}"
-        }
+    // NOTE: BubbleFactory has NO public getKey(category, type) helper — a factory
+    // is matched purely by the getCategory()/getType() pair it overrides. Test that
+    // your custom factory reports the category/type it intends to handle.
+    test("custom BubbleFactory reports its target category and type") {
+        val factory = MyPollBubbleFactory()   // your BubbleFactory subclass
+        factory.getCategory() shouldBe "custom"
+        factory.getType() shouldBe "extension_poll"
     }
 })
 ```

package/skills/cometchat-android-v6-troubleshooting/SKILL.md

@@ -3,13 +3,14 @@ name: cometchat-android-v6-troubleshooting
 description: "CometChat Android UIKit v6 troubleshooting — diagnostic table, common issues, and fixes for both Kotlin Views and Compose stacks"
 license: "MIT"
 compatibility: "Android 9.0+ (API 28); Kotlin 1.9+; com.cometchat:chatuikit-compose-android:6.x / com.cometchat:chatuikit-kotlin-android:6.x"
-allowed-tools: "shell, file-read, file-search, file-list"
 metadata:
   author: "CometChat"
   version: "3.0.1"
   tags: "cometchat, android, troubleshooting, debugging, errors, issues"
 ---
 
+> **Ground truth:** `com.cometchat:chatuikit-{compose,kotlin}-android:6.x` (+ `calls-sdk-android:5.x`) — resolved AAR (javap) + `ui-kit/android/v6`. **Official docs:** https://www.cometchat.com/docs/ui-kit/android/v6/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.
+
 > **Companion skills:** cometchat-android-v6-core (init/login), cometchat-android-v6-compose-theming, cometchat-android-v6-kotlin-theming, cometchat-android-v6-push
 
 ## Purpose
@@ -49,6 +50,7 @@ Diagnose and fix common issues with CometChat Android UIKit v6 across both Kotli
 | Call notifications not showing | VoIP permissions missing | Request READ_PHONE_STATE, MANAGE_OWN_CALLS, ANSWER_PHONE_CALLS |
 | Calls SDK not initialized | `enableCalling` not set | Set `setEnableCalling(true)` on `UIKitSettingsBuilder` |
 | `CometChatCalls` class not found | Missing calls SDK dependency | Add `com.cometchat:calls-sdk-android` to dependencies |
+| Calls broken on `chatuikit:6.0.0` (call button targets wrong user, in-call screen blank, etc.) | Known v6.0.0 calls defects — `CometChatCallButtons` captures the first-rendered user globally + 4 related bugs | Apply the **5 documented workarounds (W1–W5)** in `cometchat-android-v6-calls` (§"Five required workarounds"). The kit ships broken for calls at 6.0.0 but works end-to-end with W1–W5 (validated on device). Don't hand-patch blind — use that section. |
 | Build fails with duplicate classes | Conflicting annotation libs | Add `exclude(group = "org.jetbrains", module = "annotations-java5")` to configurations |
 | `compileSdk` error | SDK too low | Set `compileSdk = 36` |
 | `minSdk` error | API level too low | Set `minSdk = 28` — v6 requires Android 9.0+ |
@@ -155,6 +157,12 @@ If message list doesn't scroll properly, ensure the layout gives it flexible hei
 
 ## 5. Push Notification Issues
 
+### 5.0 No notifications shown on Android 13+ (API 33+)
+
+- **Symptom**: FCM messages arrive (visible in logcat) but no system notification appears on Android 13+.
+- **Cause**: `POST_NOTIFICATIONS` is a **runtime** permission on API 33+ — declaring it in the manifest isn't enough.
+- **Fix**: Declare `<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>` AND request it at runtime (`ActivityCompat.requestPermissions(...)` / the Activity Result API) before you expect notifications. Below API 33 it's granted implicitly.
+
 ### 5.1 SDK Not Initialized in FCM Service
 
 ```kotlin
@@ -170,11 +178,24 @@ override fun onMessageReceived(message: RemoteMessage) {
 
 ### 5.2 VoIP Permission Check
 
+> ⚠️ **`CometChatVoIP` is NOT a v6 kit/SDK API.** It exists only as an app-local helper in the **V5** sample app; the v6 sample even asserts it must not be referenced (`PreservationPropertyTest.kt:78`). Check the permissions directly with `ContextCompat.checkSelfPermission` (or copy the V5 helper into your project if you want its convenience wrappers):
+
 ```kotlin
-// All three permissions are required for VoIP
-val hasPermissions = CometChatVoIP.hasReadPhoneStatePermission(context) &&
-    CometChatVoIP.hasManageOwnCallsPermission(context) &&
-    CometChatVoIP.hasAnswerPhoneCallsPermission(context)
+import androidx.core.content.ContextCompat
+import android.content.pm.PackageManager
+import android.Manifest
+
+// All three permissions are required for VoIP calling
+fun hasVoipPermissions(context: Context): Boolean {
+    val needed = listOf(
+        Manifest.permission.READ_PHONE_STATE,
+        Manifest.permission.MANAGE_OWN_CALLS,
+        Manifest.permission.ANSWER_PHONE_CALLS,
+    )
+    return needed.all {
+        ContextCompat.checkSelfPermission(context, it) == PackageManager.PERMISSION_GRANTED
+    }
+}
 ```
 
 ## 6. Dependency Conflicts