@cometchat/skills 4.3.0 → 4.4.0

package/skills/cometchat-android-v5-customization/SKILL.md

@@ -3,13 +3,14 @@ name: cometchat-android-v5-customization
 description: "Customize CometChat components beyond theming — custom message templates, DataSource decorators, event listeners, and custom view slots."
 license: "MIT"
 compatibility: "Android 7.0+; Java 8+; Kotlin 1.8+; com.cometchat:chat-uikit-android:5.x"
-allowed-tools: "shell, file-read, file-search, file-list, grep"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat android customization custom-view message-template datasource events"
 ---
 
+> **Ground truth:** `com.cometchat:chat-uikit-android:5.x` (legacy/maintenance-only; +`calls-sdk-android:5.x`) — resolved AAR (javap) + `ui-kit/android`. **Official docs:** https://www.cometchat.com/docs/ui-kit/android/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-v5-components` provides the component
 > catalog; `cometchat-android-v5-theming` covers visual styling;
 > `cometchat-android-v5-extensions` covers the extension architecture.
@@ -40,6 +41,8 @@ This skill teaches how to customize CometChat components beyond what theming pro
 
 Templates define how message bubbles are rendered. Each template maps a message `type` + `category` to custom views.
 
+> **Prefer the decorator (§3) for anything app-wide.** The per-list `setTemplates(...)` shown here only affects the one `CometChatMessageList` you call it on. To register a custom type, override a built-in bubble, add an attachment, or add a long-press option **everywhere**, use the four `DataSourceDecorator` recipes in §3 — that is the pattern the kit's own extensions use.
+
 **Java:**
 ```java
 CometChatMessageTemplate template = new CometChatMessageTemplate()
@@ -71,10 +74,16 @@ CometChatMessageTemplate template = new CometChatMessageTemplate()
         return options;
     });
 
-// Apply to message list
-messageList.setTemplates(Collections.singletonList(template));
+// Apply to message list — APPEND to defaults, never replace.
+// ❌ messageList.setTemplates(Collections.singletonList(template));  // wipes ALL default bubbles
+List<CometChatMessageTemplate> templates =
+    CometChatUIKit.getDataSource().getMessageTemplates(new AdditionParameter());
+templates.add(template);                 // keep text/image/video/file/… + add yours
+messageList.setTemplates(templates);
 ```
 
+> **The #1 custom-bubble mistake:** `setTemplates(singletonList(myTemplate))` replaces the entire template set, so every default bubble (text, image, video, audio, file, …) stops rendering. Always seed the list from `CometChatUIKit.getDataSource().getMessageTemplates(new AdditionParameter())` and `add()` your template — or register a `DataSourceDecorator` (§3) so the append applies app-wide.
+
 **Kotlin:**
 ```kotlin
 val template = CometChatMessageTemplate()
@@ -99,7 +108,11 @@ val template = CometChatMessageTemplate()
             R.drawable.ic_custom) { /* handle click */ })
     }
 
-messageList.setTemplates(listOf(template))
+// APPEND to defaults — don't replace.
+// ❌ messageList.setTemplates(listOf(template))  // wipes ALL default bubbles
+val templates = CometChatUIKit.getDataSource().getMessageTemplates(AdditionParameter())
+templates.add(template)
+messageList.setTemplates(templates)
 ```
 
 ### Template view slots
@@ -118,20 +131,26 @@ messageList.setTemplates(listOf(template))
 
 ## 2. CometChatMessageOption
 
-Custom actions in the message long-press menu.
+Custom actions in the message long-press menu. `CometChatMessageOption extends CometChatOption`. Verified constructor (`CometChatMessageOption.java:43`):
+
+```java
+public CometChatMessageOption(@NotNull String id, @NotNull String title, @ColorInt int icon, OnClick onClick)
+```
 
 **Java:**
 ```java
 CometChatMessageOption option = new CometChatMessageOption(
     "bookmark",                    // unique ID
     "Bookmark",                    // title
-    R.drawable.ic_bookmark,        // icon
-    () -> {                        // onClick
+    R.drawable.ic_bookmark,        // icon — see note below
+    () -> {                        // onClick (com.cometchat.chatuikit.shared.interfaces.OnClick)
         // Handle bookmark action
     }
 );
 ```
 
+> **Icon-param quirk:** the 4-arg constructor's third param is annotated `@ColorInt int icon`, but the kit's own decorators pass a **drawable** resource here (e.g. `MessageTranslationDecorator.java:53` passes `R.drawable.cometchat_ic_translate`). Pass your `R.drawable.*` id — the annotation is misleading, the runtime treats it as a drawable. The 7-arg constructor (`CometChatMessageOption.java:58`) adds `titleColor`, `iconTintColor`, `titleAppearance` if you need styling.
+
 ---
 
 ## 3. DataSource and DataSourceDecorator
@@ -183,6 +202,147 @@ ChatConfigurator.enable(dataSource -> new CustomDataSource(dataSource));
 ChatConfigurator.enable { dataSource -> CustomDataSource(dataSource) }
 ```
 
+### The four customization scenarios (all via the decorator)
+
+The canonical Android V5 extension surface is the `DataSource` chain. The four most common requests each map to **one overridden method** on your `DataSourceDecorator`. Every override **must call `super.*` first** and append — returning a fresh list/template wipes the kit's defaults. These are the exact methods + signatures the kit's own extensions use; cited file:line for each.
+
+#### Scenario 1 — Register a custom message type (new bubble)
+
+Override `getMessageTemplates(...)` and append a `CometChatMessageTemplate` whose `setCategory(...)` is `UIKitConstants.MessageCategory.CUSTOM` and whose `setType(...)` is your custom type string. Render its bubble with `setContentView(MessagesViewHolderListener)`. This mirrors `PollsExtensionDecorator.getMessageTemplates` (`PollsExtensionDecorator.java:82-86`) + `getPollTemplate` (`PollsExtensionDecorator.java:220-309`).
+
+**Java:**
+```java
+@Override
+public List<CometChatMessageTemplate> getMessageTemplates(@NonNull AdditionParameter additionParameter) {
+    List<CometChatMessageTemplate> templates = super.getMessageTemplates(additionParameter); // keep defaults
+    templates.add(getLocationTemplate(additionParameter));
+    return templates;
+}
+
+private CometChatMessageTemplate getLocationTemplate(@NonNull AdditionParameter additionParameter) {
+    return new CometChatMessageTemplate()
+        .setCategory(UIKitConstants.MessageCategory.CUSTOM)   // CUSTOM, not MESSAGE
+        .setType("location")                                  // your custom type
+        // setOptions: Function3<Context, BaseMessage, Group, List<CometChatMessageOption>>
+        .setOptions((context, baseMessage, group) ->
+            ChatConfigurator.getDataSource().getCommonOptions(context, baseMessage, group, additionParameter))
+        .setContentView(new MessagesViewHolderListener() {
+            @Override
+            public View createView(Context context, CometChatMessageBubble messageBubble,
+                                   UIKitConstants.MessageBubbleAlignment alignment) {
+                return LayoutInflater.from(context).inflate(R.layout.custom_location_bubble, null);
+            }
+            @Override
+            public void bindView(Context context, View createdView, BaseMessage message,
+                                 UIKitConstants.MessageBubbleAlignment alignment,
+                                 RecyclerView.ViewHolder holder, List<BaseMessage> messageList, int position) {
+                // bind from (CustomMessage) message customData
+            }
+        });
+}
+```
+
+> You usually also want the type to count as a known type: override `getDefaultMessageTypes(...)` / `getDefaultMessageCategories(...)` and append your type / `MessageCategory.CUSTOM` (Polls does exactly this — `PollsExtensionDecorator.java:171-186`).
+
+#### Scenario 2 — Override an existing built-in type's bubble
+
+Do **not** rebuild the template list. Override the per-type template getter and mutate the template returned by `super`. The verified getters on `DataSource` are `getTextTemplate(AdditionParameter)`, `getImageTemplate`, `getVideoTemplate`, `getAudioTemplate`, `getFileTemplate` (`DataSource.java:230-244`), plus the lookup `getMessageTemplate(String category, String type, AdditionParameter)` (`DataSource.java:260`). The decorator forwards each to the wrapped source (`DataSourceDecorator.java:598`, `:652`), so call `super` then re-skin only the slot you want.
+
+**Java:**
+```java
+@Override
+public CometChatMessageTemplate getTextTemplate(@NonNull AdditionParameter additionParameter) {
+    CometChatMessageTemplate template = super.getTextTemplate(additionParameter); // keeps type/category/options
+    template.setContentView(new MessagesViewHolderListener() {                    // swap only the content slot
+        @Override
+        public View createView(Context context, CometChatMessageBubble messageBubble,
+                               UIKitConstants.MessageBubbleAlignment alignment) {
+            return LayoutInflater.from(context).inflate(R.layout.my_text_bubble, null);
+        }
+        @Override
+        public void bindView(Context context, View createdView, BaseMessage message,
+                             UIKitConstants.MessageBubbleAlignment alignment,
+                             RecyclerView.ViewHolder holder, List<BaseMessage> messageList, int position) {
+            ((TextView) createdView.findViewById(R.id.body)).setText(((TextMessage) message).getText());
+        }
+    });
+    return template;
+}
+```
+
+> `setContentView`/`setBubbleView`/`setHeaderView`/`setBottomView`/`setStatusInfoView`/`setFooterView`/`setReplyView` all take a `MessagesViewHolderListener` and return the template (`CometChatMessageTemplate.java:79-202`) — pick the slot you need. Overriding `getTextTemplate` reskins **every** text bubble app-wide while preserving its default options/category/type.
+
+#### Scenario 3 — Add a composer attachment option
+
+Override `getAttachmentOptions(...)`, call `super`, and append a `CometChatMessageComposerAction` (a builder — `setId/setTitle/setIcon/setOnClick`, `CometChatMessageComposerAction.java:46-127`). This is exactly `PollsExtensionDecorator.getAttachmentOptions` (`PollsExtensionDecorator.java:88-168`).
+
+**Java:**
+```java
+@Override
+public List<CometChatMessageComposerAction> getAttachmentOptions(Context context, User user,
+        Group group, HashMap<String, String> idMap, @NonNull AdditionParameter additionParameter) {
+    List<CometChatMessageComposerAction> options =
+        super.getAttachmentOptions(context, user, group, idMap, additionParameter); // keep camera/gallery/file/poll/…
+    options.add(new CometChatMessageComposerAction()
+        .setId("location")
+        .setTitle("Send Location")
+        .setIcon(R.drawable.ic_location)
+        .setOnClick(() -> { /* pick + send (see below) */ }));
+    return options;
+}
+```
+
+#### Scenario 4 — Add a message long-press option (Forward-style)
+
+Override the **per-type** option getter — `getTextMessageOptions`, `getImageMessageOptions`, `getVideoMessageOptions`, `getAudioMessageOptions`, or `getFileMessageOptions` (`DataSource.java:49-108`) — call `super`, then append a `CometChatMessageOption`. This is exactly `MessageTranslationDecorator.getTextMessageOptions` (`MessageTranslationDecorator.java:44-59`).
+
+**Java:**
+```java
+@Override
+public List<CometChatMessageOption> getTextMessageOptions(Context context,
+        BaseMessage baseMessage, Group group, @NonNull AdditionParameter additionParameter) {
+    List<CometChatMessageOption> options =
+        super.getTextMessageOptions(context, baseMessage, group, additionParameter); // keep reply/copy/edit/delete/…
+    if (baseMessage != null && baseMessage.getDeletedAt() == 0) {
+        options.add(new CometChatMessageOption(
+            "forward", "Forward", R.drawable.ic_forward, () -> { /* forward baseMessage */ }));
+    }
+    return options;
+}
+```
+
+> `getMessageOptions(...)` (`DataSource.java:271`) is the **aggregate** dispatcher the kit calls per message; it routes to the per-type getters above. To add an option to *one* message type, override that type's getter (as above). Override `getMessageOptions` only when you want the option on **every** message type at once.
+
+> **Append rule (all four):** an override that returns a fresh `new ArrayList<>()` instead of starting from `super.*` wipes every default (bubbles, attachments, or options). Always seed from `super`.
+
+Register the decorator app-wide via `ChatConfigurator.enable(...)` (§"Register via ChatConfigurator" above) — it accepts `Function1<DataSource, DataSource>` (`ChatConfigurator.java:39`). For a packaged two-class extension (registrar + decorator), see `cometchat-android-v5-extensions`.
+
+### Sending a custom message — use the UIKit path, not the raw SDK
+
+```java
+CustomMessage message = new CustomMessage(
+    receiverId, CometChatConstants.RECEIVER_TYPE_USER,   // or RECEIVER_TYPE_GROUP
+    "location",                                          // matches the template type
+    customData);                                         // JSONObject
+// ✅ kit path — sets muid + sender, fires ccMessageSent → list APPENDS
+CometChatUIKit.sendCustomMessage(message, new CometChat.CallbackListener<CustomMessage>() {
+    @Override public void onSuccess(CustomMessage m) { }
+    @Override public void onError(CometChatException e) { }
+});
+// ❌ CometChat.sendCustomMessage(...) — no muid/sender/event → recipient error + realtime replace
+```
+
+Verified against kit source (chat-uikit-android 5.x):
+- `CometChatUIKit.getDataSource()`, `ChatConfigurator.getDataSource()` / `ChatConfigurator.enable(Function1<DataSource,DataSource>)` (`ChatConfigurator.java:39,55`)
+- `DataSource.getMessageTemplates(AdditionParameter)` (`DataSource.java:248`); per-type template getters `getTextTemplate/getImageTemplate/getVideoTemplate/getAudioTemplate/getFileTemplate(AdditionParameter)` (`DataSource.java:230-244`); lookup `getMessageTemplate(String category, String type, AdditionParameter)` (`DataSource.java:260`)
+- Per-type option getters `getTextMessageOptions/getImageMessageOptions/getVideoMessageOptions/getAudioMessageOptions/getFileMessageOptions(Context, BaseMessage, Group, AdditionParameter)` (`DataSource.java:49-108`); aggregate `getMessageOptions(...)` (`DataSource.java:271`)
+- `DataSource.getAttachmentOptions(Context, User, Group, HashMap, AdditionParameter)` (`DataSource.java:286`)
+- `CometChatMessageTemplate` setters `setType/setCategory(String)`, `setOptions(Function3<Context,BaseMessage,Group,List<CometChatMessageOption>>)`, `setContentView/setBubbleView/setHeaderView/setBottomView/setStatusInfoView/setFooterView/setReplyView(MessagesViewHolderListener)` (`CometChatMessageTemplate.java:79-237`)
+- `CometChatMessageComposerAction` builder `setId/setTitle/setIcon/setOnClick(...)` (`CometChatMessageComposerAction.java:46-127`); `CometChatMessageOption(String,String,int,OnClick)` (`CometChatMessageOption.java:43`)
+- `MessagesViewHolderListener.createView(...)` + `bindView(...)` (`MessagesViewHolderListener.java:18-26`)
+- `CometChatUIKit.sendCustomMessage(CustomMessage, CallbackListener)`
+- Canonical reference decorators: `PollsExtensionDecorator.java` (template + attachment), `MessageTranslationDecorator.java` (message option)
+
 ---
 
 ## 4. Event system
@@ -303,3 +463,7 @@ header.setSubtitleView((context, user, group) -> {
 - **Register `ChatConfigurator.enable()` AFTER `CometChatUIKit.init()` succeeds.** The configurator resets on init.
 - **Always remove event listeners when the Activity/Fragment is destroyed.** Use `onDestroy()` or `onDestroyView()`.
 - **Template view slots use `MessagesViewHolderListener`.** Implement both `createView()` and `bindView()`.
+
+## Sound (in-app message + call sounds)
+
+The V5 UI Kit surfaces `CometChatSoundManager` for incoming/outgoing message + call sounds (mute / custom audio). **V5 is legacy/maintenance-only** — V6 is the current cohort. For call sounds see this family's `-calls` skill; verify the `CometChatSoundManager` API against the installed kit before relying on it.

package/skills/cometchat-android-v5-extensions/SKILL.md

@@ -3,13 +3,14 @@ name: cometchat-android-v5-extensions
 description: "Extension architecture for CometChat Android — ExtensionsDataSource, decorators, built-in extensions, and how to create custom extensions."
 license: "MIT"
 compatibility: "Android 7.0+; Java 8+; Kotlin 1.8+; com.cometchat:chat-uikit-android:5.x"
-allowed-tools: "shell, file-read, file-search, file-list"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat android extensions datasource decorator polls stickers collaborative"
 ---
 
+> **Ground truth:** `com.cometchat:chat-uikit-android:5.x` (legacy/maintenance-only; +`calls-sdk-android:5.x`) — resolved AAR (javap) + `ui-kit/android`. **Official docs:** https://www.cometchat.com/docs/fundamentals/extensions-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-v5-customization` covers DataSource decorators;
 > `cometchat-android-v5-features` covers the feature catalog.
 
@@ -98,7 +99,7 @@ public class MyExtensionDecorator extends DataSourceDecorator {
     // Override methods to add custom behavior
 }
 
-// 2. Registrar — extends ExtensionsDataSource, exposes getExtensionId() and enable()
+// 2. Registrar — extends ExtensionsDataSource, implements getExtensionId() + addExtension()
 public class MyExtension extends ExtensionsDataSource {
     @Override
     public String getExtensionId() {
@@ -106,7 +107,9 @@ public class MyExtension extends ExtensionsDataSource {
     }
 
     @Override
-    public void enable() {
+    public void addExtension() {
+        // addExtension() is the ABSTRACT method you must implement. The inherited
+        // concrete enable() calls it after confirming the extension is on (dashboard).
         ChatConfigurator.enable(dataSource -> new MyExtensionDecorator(dataSource));
     }
 }
@@ -119,6 +122,6 @@ extensions.add(new MyExtension());
 
 ## Hard rules
 
-- **Two classes per extension.** A registrar (`ExtensionsDataSource`, holds `getExtensionId()` + `enable()`) and a decorator (`DataSourceDecorator`, holds the per-message override). `setExtensions(...)` wants registrars; the chain builds decorators automatically.
+- **Two classes per extension.** A registrar (`ExtensionsDataSource`, implements abstract `getExtensionId()` + `addExtension()`; `enable()` is inherited) and a decorator (`DataSourceDecorator`, holds the per-message override). `setExtensions(...)` wants registrars; the chain builds decorators automatically.
 - **Register after init.** `ChatConfigurator.enable()` must be called after `CometChatUIKit.init()` succeeds.
 - **Backend extension toggle still applies.** Even if an extension is registered client-side, it needs to be enabled on the app's backend. Use `cometchat apply-feature <id> --app-id <X>` (the CLI hits the dashboard API). For dashboard-only extensions (Giphy / Stipop / Tenor / Chatwoot / Intercom — those needing third-party API keys), the user has to enter the third-party config in the dashboard manually.

package/skills/cometchat-android-v5-features/SKILL.md

@@ -3,13 +3,14 @@ name: cometchat-android-v5-features
 description: "Add features (calls, reactions, polls, file sharing, AI, etc.) to an already-integrated CometChat project. Routes to the right sub-flow based on feature type."
 license: "MIT"
 compatibility: "Android 7.0+; Java 8+; Kotlin 1.8+; com.cometchat:chat-uikit-android:5.x"
-allowed-tools: "shell, file-read, file-search, file-list"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat android features extensions calls reactions polls ai-features"
 ---
 
+> **Ground truth:** `com.cometchat:chat-uikit-android:5.x` (legacy/maintenance-only; +`calls-sdk-android:5.x`) — resolved AAR (javap) + `ui-kit/android`. **Official docs:** https://www.cometchat.com/docs/fundamentals/extensions-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-v5-core` covers initialization;
 > `cometchat-android-v5-customization` covers deeper component customization;
 > `cometchat-android-v5-extensions` covers the extension architecture.
@@ -42,7 +43,7 @@ This skill teaches how CometChat features are structured and what work is requir
 | Type 1 — Default | Built into the UI Kit at compile time | None — already there |
 | Type 2a — Extension | Backend extension, pure boolean toggle | `cometchat apply-feature <id> --app-id <X>` (CLI hits dashboard API) |
 | Type 2b — AI feature | Backend AI feature requiring an OpenAI key | `cometchat apply-feature <id> --app-id <X> --openai-key sk-...` |
-| Type 2c — Dashboard-only | Third-party API key / multi-field config (Giphy, Stipop, Tenor, Chatwoot, Intercom) | Open https://app.cometchat.com → Extensions → configure |
+| Type 2c — Dashboard-only | Third-party API key / multi-field config (Giphy, Stipop, Tenor, Chatwoot, Intercom) | Open https://app.cometchat.com → Chat & Messaging → Features → configure |
 | Type 3 — Package-install | Requires a separate SDK dependency | Add Gradle dependency |
 | Type 4 — Component-toggle | Hide/show via `setHide*` / `disable*` methods on the relevant component | Call the setter on the component instance (see catalog) |
 
@@ -94,7 +95,7 @@ Requires `cometchat auth login` once per machine.
 **AI Features (CLI-toggleable — needs `--openai-key`):**
 Conversation Starter, Conversation Summary, Smart Reply
 
-**Dashboard-only (third-party config — open https://app.cometchat.com → Extensions):**
+**Dashboard-only (third-party config — open https://app.cometchat.com → Chat & Messaging → Features):**
 Stickers (Stipop), Giphy, Tenor, Chatwoot, Intercom — these require API keys / webhooks the user must enter manually.
 
 ---
@@ -106,7 +107,7 @@ Stickers (Stipop), Giphy, Tenor, Chatwoot, Intercom — these require API keys /
 Add the calling SDK:
 
 ```groovy
-implementation 'com.cometchat:calls-sdk-android:4.+'
+implementation 'com.cometchat:calls-sdk-android:5.+'
 ```
 
 The UI Kit auto-detects the calling SDK and enables call buttons in `CometChatMessageHeader`. No additional code needed — `CometChatIncomingCall`, `CometChatOutgoingCall`, and `CometChatOngoingCall` activate automatically.

package/skills/cometchat-android-v5-placement/SKILL.md

@@ -3,13 +3,14 @@ name: cometchat-android-v5-placement
 description: "Where to put CometChat in your Android app — Activity, Fragment, BottomSheet, Dialog, Tab, or embedded patterns."
 license: "MIT"
 compatibility: "Android 7.0+; Java 8+; Kotlin 1.8+; com.cometchat:chat-uikit-android:5.x"
-allowed-tools: "shell, file-read, file-search, file-list"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "chat cometchat android placement activity fragment bottomsheet dialog tabs integration"
 ---
 
+> **Ground truth:** `com.cometchat:chat-uikit-android:5.x` (legacy/maintenance-only) views + `docs/ui-kit/android`. **Official docs:** https://www.cometchat.com/docs/ui-kit/android/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-v5-core` covers init and login;
 > `cometchat-android-v5-components` provides the component catalog.
 

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

@@ -3,13 +3,14 @@ name: cometchat-android-v5-production
 description: "Production readiness for CometChat Android — server-side token auth, user management CRUD, ProGuard rules, and security checklist."
 license: "MIT"
 compatibility: "Android 7.0+; Java 8+; Kotlin 1.8+; com.cometchat:chat-uikit-android:5.x"
-allowed-tools: "shell, file-read, file-search, file-list"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat android production auth token security user-management proguard"
 ---
 
+> **Ground truth:** `com.cometchat:chat-uikit-android:5.x` (legacy/maintenance-only; +`calls-sdk-android:5.x`) — resolved AAR (javap) + `ui-kit/android`. **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-v5-core` covers dev-mode login;
 > `cometchat-android-v5-push` covers push notification setup for production.
 

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

@@ -3,7 +3,6 @@ name: cometchat-android-v5-push
 description: "Push notifications for CometChat Android — FCM setup, CometChatNotifications API, token registration with PushPlatforms, foreground/background handling, notification channels, reply-from-notification, and tap-to-deep-link."
 license: "MIT"
 compatibility: "Android 7.0+; Java 8+; Kotlin 1.8+; com.cometchat:chat-uikit-android:5.x; com.google.firebase:firebase-messaging"
-allowed-tools: "shell, file-read, file-search, file-list"
 metadata:
   author: "CometChat"
   version: "3.0.0"
@@ -17,7 +16,7 @@ metadata:
 
 Push notifications are non-negotiable for production chat. Without them, a backgrounded app never wakes when a message arrives. This skill covers end-to-end FCM setup for CometChat Android v5 — using the correct `CometChatNotifications` API with `PushPlatforms.FCM_ANDROID`, notification channels, foreground/background handling, reply-from-notification, and tap-to-deep-link.
 
-**Ground truth:** `sample-app-java+push-notification/src/main/java/com/cometchat/sampleapp/java/fcm/` and `sample-app-kotlin+push-notification/src/main/java/com/cometchat/sampleapp/kotlin/fcm/` in the v5 UIKit repository.
+**Ground truth:** `sample-app-java+push-notification/src/main/java/com/cometchat/sampleapp/java/fcm/` and `sample-app-kotlin+push-notification/src/main/java/com/cometchat/sampleapp/kotlin/fcm/` in the v5 UIKit repository. **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).
 
 ---
 
@@ -108,7 +107,7 @@ The v5 SDK uses `CometChatNotifications.registerPushToken()` — **not** the dep
 
 | Method | Signature | Description |
 |---|---|---|
-| `registerPushToken` | `CometChatNotifications.registerPushToken(String token, String platform, String providerId, CallbackListener<String>)` | Register FCM token with CometChat |
+| `registerPushToken` | `CometChatNotifications.registerPushToken(String token, PushPlatforms platform, String providerId, CallbackListener<String>)` | Register FCM token with CometChat (param 2 is the `PushPlatforms` enum, e.g. `PushPlatforms.FCM_ANDROID` — not a String) |
 | `unregisterPushToken` | `CometChatNotifications.unregisterPushToken(CallbackListener<String>)` | Unregister token (call before logout) |
 
 ### PushPlatforms constants

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

@@ -3,13 +3,14 @@ name: cometchat-android-v5-testing
 description: "Testing patterns for CometChat Android — JUnit + Mockito setup, mocking the SDK, Espresso UI tests, E2E with Maestro, and CI integration."
 license: "MIT"
 compatibility: "Android 7.0+; Java 8+; Kotlin 1.8+; com.cometchat:chat-uikit-android:5.x; JUnit 4 (kit sample apps); Mockito/MockK"
-allowed-tools: "shell, file-read, file-search, file-list"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat android testing junit espresso maestro mockito ci"
 ---
 
+> **Ground truth:** `com.cometchat:chat-uikit-android:5.x` (legacy/maintenance-only; +`calls-sdk-android:5.x`) — resolved AAR (javap) + `ui-kit/android`. **Official docs:** https://www.cometchat.com/docs/ui-kit/android/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-v5-core` covers init/login patterns you're testing;
 > `cometchat-android-v5-components` covers component APIs to assert against.
 

package/skills/cometchat-android-v5-theming/SKILL.md

@@ -3,13 +3,14 @@ name: cometchat-android-v5-theming
 description: "Customize CometChat UI to match your app's design system. Covers CometChatTheme, XML attributes, style classes, dark mode, and color system."
 license: "MIT"
 compatibility: "Android 7.0+; Java 8+; Kotlin 1.8+; com.cometchat:chat-uikit-android:5.x"
-allowed-tools: "shell, file-read, file-search, file-list"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat android theming customization branding dark-mode colors styles"
 ---
 
+> **Ground truth:** `com.cometchat:chat-uikit-android:5.x` (legacy/maintenance-only; +`calls-sdk-android:5.x`) — resolved AAR (javap) + `ui-kit/android`. **Official docs:** https://www.cometchat.com/docs/ui-kit/android/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-v5-core` covers initialization;
 > `cometchat-android-v5-components` provides the component catalog;
 > `cometchat-android-v5-customization` covers deeper component-level overrides.

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

@@ -3,13 +3,14 @@ name: cometchat-android-v5-troubleshooting
 description: "Diagnose and fix problems with a CometChat Android integration. Gradle errors, runtime crashes, rendering issues, and version compatibility."
 license: "MIT"
 compatibility: "Android 7.0+; Java 8+; Kotlin 1.8+; com.cometchat:chat-uikit-android:5.x"
-allowed-tools: "shell, file-read, file-search, file-list, grep"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat android troubleshooting fix diagnose errors crashes gradle proguard"
 ---
 
+> **Ground truth:** `com.cometchat:chat-uikit-android:5.x` (legacy/maintenance-only; +`calls-sdk-android:5.x`) — resolved AAR (javap) + `ui-kit/android`. **Official docs:** https://www.cometchat.com/docs/ui-kit/android/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-v5-core` covers correct init/login patterns;
 > `cometchat-android-v5-production` covers ProGuard rules.
 
@@ -50,7 +51,7 @@ This skill teaches how to diagnose CometChat Android integration problems system
 | `NetworkOnMainThreadException` | Calling CometChat sync methods on main thread | Use callbacks (all CometChat methods are async) |
 | `minSdkVersion 21` error | CometChat requires API 24+ | Set `minSdkVersion 24` in build.gradle |
 | Message list shows wrong messages | `setUser()`/`setGroup()` called with wrong object | Verify UID/GUID matches the intended conversation |
-| Calling buttons not showing | Calling SDK not added | Add `com.cometchat:calls-sdk-android:4.+` dependency |
+| Calling buttons not showing | Calling SDK not added | Add `com.cometchat:calls-sdk-android:5.+` dependency (matches `-core`/`-features`) |
 | `java.lang.NoSuchMethodError` | Version mismatch between UI Kit and Chat SDK | Use compatible versions — UI Kit 5.x requires Chat SDK 4.x |
 
 ---

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

@@ -3,13 +3,14 @@ name: cometchat-android-v6
 description: "Entry-point dispatcher for CometChat Android UIKit v6 — routes to the correct skill based on project stack and task"
 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, uikit, kotlin, jetpack-compose, dispatcher"
 ---
 
+> **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, cometchat-android-v6-events, cometchat-android-v6-kotlin-components, cometchat-android-v6-compose-components, cometchat-android-v6-kotlin-theming, cometchat-android-v6-compose-theming, cometchat-android-v6-kotlin-customization, cometchat-android-v6-compose-customization, cometchat-android-v6-kotlin-placement, cometchat-android-v6-compose-placement, cometchat-android-v6-builder-settings, cometchat-android-v6-features, cometchat-android-v6-extensions, cometchat-android-v6-push, cometchat-android-v6-production, cometchat-android-v6-troubleshooting, cometchat-android-v6-testing
 
 ## Purpose

package/skills/cometchat-android-v6-builder-settings/SKILL.md

@@ -3,13 +3,14 @@ name: cometchat-android-v6-builder-settings
 description: "CometChat Android UIKit v6 UIKitSettings configuration — all builder options for SDK init, presence, calling, and host overrides"
 license: "MIT"
 compatibility: "Android 9.0+ (API 28); Kotlin 1.9+; com.cometchat:chatuikit-core-android:6.x"
-allowed-tools: "shell, file-read, file-search, file-list"
 metadata:
   author: "CometChat"
   version: "3.0.0"
   tags: "cometchat, android, settings, builder, configuration, calling"
 ---
 
+> **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-push (FCM/VoIP)
 
 ## Purpose
@@ -47,13 +48,14 @@ val settings = UIKitSettings.UIKitSettingsBuilder()
     .subscribePresenceForAllUsers()              // Subscribe to all users' presence
     .subscribePresenceForRoles(listOf("admin"))  // Subscribe by roles
     .subscribePresenceForFriends()               // Subscribe to friends' presence
+    .setRoles(listOf("admin"))                   // Override the roles list directly (advanced)
 
     // Socket connection
     .setAutoEstablishSocketConnection(true)      // Auto-connect (default: true)
 
     // Calling
     .setEnableCalling(true)                      // Auto-init CometChatCalls SDK (default: false)
-    .setCallSettingsBuilder(callSettingsBuilder)  // Custom call config (optional)
+    .setCallSettingsBuilder(sessionSettingsBuilder)  // Custom call config (optional) — pass a CometChatCalls.SessionSettingsBuilder
 
     // Host overrides (advanced — for on-premise deployments)
     .overrideAdminHost("https://custom-admin.example.com")
@@ -92,23 +94,25 @@ For custom call settings:
 ```kotlin
 import com.cometchat.calls.core.CometChatCalls
 
-val callSettingsBuilder = CometChatCalls.CallSettingsBuilder(context, null)
-    .setDefaultAudioMode("SPEAKER")
-    .startWithVideoMuted(true)
+// The kit stores/uses a SessionSettingsBuilder (no-arg ctor) — NOT CallSettingsBuilder.
+// setCallSettingsBuilder(Any) casts its arg to CometChatCalls.SessionSettingsBuilder
+// internally; passing a CallSettingsBuilder is silently stored as null.
+val sessionSettingsBuilder = CometChatCalls.SessionSettingsBuilder()
+    // configure via the SessionSettingsBuilder setters (see cometchat-android-v6-calls)
 
 val settings = UIKitSettings.UIKitSettingsBuilder()
     .setAppId("APP_ID")
     .setRegion("us")
     .setAuthKey("AUTH_KEY")
     .setEnableCalling(true)
-    .setCallSettingsBuilder(callSettingsBuilder)
+    .setCallSettingsBuilder(sessionSettingsBuilder)  // param typed Any; pass a SessionSettingsBuilder
     .build()
 ```
 
 After init, retrieve the stored builder:
 
 ```kotlin
-val builder: CometChatCalls.CallSettingsBuilder? = CometChatUIKit.getCallSettingsBuilder()
+val builder: CometChatCalls.SessionSettingsBuilder? = CometChatUIKit.getSessionSettingsBuilder()
 ```
 
 ## 4. Checking Initialization State