@cometchat/skills-cli 2.4.0 → 2.4.1

package/dist/index.js

@@ -301,7 +301,8 @@ import { readdirSync } from "node:fs";
 
 // src/utils/version.ts
 function stripRange(versionRange) {
-  return versionRange.replace(/^[\^~>=<\s]+/, "").trim();
+  const aliased = versionRange.replace(/^npm:.*@/, "");
+  return aliased.replace(/^[\^~>=<\s]+/, "").trim();
 }
 function extractMajor(versionRange) {
   if (!versionRange) return null;
@@ -362,15 +363,9 @@ function detectExpo(root, deps, pkg) {
     react_native_version: rnVersion
   };
 }
-function detectBareReactNative(root, deps) {
+function detectBareReactNative(_root, deps) {
   if (!deps["react-native"]) return null;
   if (deps["expo"]) return null;
-  const hasNativeIos = pathExists(p(root, "ios")) && (pathExists(p(root, "ios/Podfile")) || pathExists(p(root, "ios/Podfile.properties.json")));
-  const hasNativeAndroid = pathExists(p(root, "android")) && pathExists(p(root, "android/build.gradle"));
-  const hasRnConfig = pathExists(p(root, "react-native.config.js")) || pathExists(p(root, "react-native.config.ts"));
-  if (!hasNativeIos && !hasNativeAndroid && !hasRnConfig) {
-    return null;
-  }
   const rnVersion = extractVersion(deps["react-native"]);
   return {
     framework: "react-native",
@@ -835,6 +830,207 @@ function detectExistingIntegration(root) {
   };
 }
 
+// src/detectors/version-conflict.ts
+init_fs();
+function mergedDeps(root) {
+  const pkg = readJsonOrNull(p(root, "package.json"));
+  if (!pkg) return {};
+  return { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
+}
+function matchMajor(text, re) {
+  const m = text.match(re);
+  return m && m[1] ? parseInt(m[1], 10) : null;
+}
+function androidBuildText(root) {
+  return ["build.gradle", "build.gradle.kts", "app/build.gradle", "app/build.gradle.kts"].map((f) => readFileOrNull(p(root, f)) ?? "").join("\n");
+}
+var WEB_FRAMEWORKS = /* @__PURE__ */ new Set(["reactjs", "nextjs", "react-router", "astro"]);
+function detectVersionConflict(root, framework) {
+  const deps = mergedDeps(root);
+  if (framework && WEB_FRAMEWORKS.has(framework)) {
+    const m = extractMajor(deps["@cometchat/chat-uikit-react"]);
+    if (m != null && m !== 6) {
+      return {
+        kind: "kit-major-mismatch",
+        installed: `v${m}`,
+        expected: "v6",
+        detail: `Project has @cometchat/chat-uikit-react v${m} installed, but these skills target v6. Upgrade to ^6 (\`npm i @cometchat/chat-uikit-react@^6\`) before integrating \u2014 v${m} APIs differ from the v6 guidance the skills emit, so the generated code won't compile/run.`
+      };
+    }
+  }
+  if (framework === "react-native") {
+    const m = extractMajor(deps["@cometchat/chat-uikit-react-native"]);
+    if (m != null && m !== 5) {
+      return {
+        kind: "kit-major-mismatch",
+        installed: `v${m}`,
+        expected: "v5",
+        detail: `Project has @cometchat/chat-uikit-react-native v${m}, but these skills target v5 (the current RN UI Kit). Reconcile the installed version before integrating.`
+      };
+    }
+  }
+  if (framework === "angular") {
+    const m = extractMajor(deps["@cometchat/chat-uikit-angular"]);
+    if (m != null && m !== 5) {
+      return {
+        kind: "kit-major-mismatch",
+        installed: `v${m}`,
+        expected: "v5",
+        detail: `Project has @cometchat/chat-uikit-angular v${m}, but these skills target v5. Reconcile the installed version before integrating.`
+      };
+    }
+  }
+  if (framework === "android") {
+    const t = androidBuildText(root);
+    const hasV5 = /com\.cometchat:chat-uikit-android:5/.test(t);
+    const hasV6 = /com\.cometchat:chatuikit-(compose|kotlin)-android:6/.test(t);
+    if (hasV5 && hasV6) {
+      return {
+        kind: "both-versions",
+        installed: "V5 + V6",
+        detail: "Both the V5 UI Kit (com.cometchat:chat-uikit-android:5.x) and the V6 UI Kit (com.cometchat:chatuikit-{compose,kotlin}-android:6.x) are declared in the Gradle build. They are different SDKs with overlapping class names \u2192 duplicate-class / namespace-collision build failures. Remove the cohort you are NOT integrating before proceeding."
+      };
+    }
+  }
+  if (framework === "flutter") {
+    const pub = readFileOrNull(p(root, "pubspec.yaml")) ?? "";
+    const hasV6 = /cometchat_chat_uikit\s*:\s*[\^~]?6\./.test(pub);
+    const hasV5 = /cometchat_chat_uikit\s*:\s*[\^~]?5\./.test(pub) || /cometchat_calls_uikit\s*:\s*[\^~]?5\./.test(pub);
+    if (hasV6 && hasV5) {
+      return {
+        kind: "both-versions",
+        installed: "V5 + V6",
+        detail: "pubspec.yaml declares both V6 (cometchat_chat_uikit ^6.x) and V5 (cometchat_chat_uikit ^5.x / cometchat_calls_uikit ^5.x) CometChat packages. The V5 GetX kit and V6 Bloc kit cannot coexist. Remove the cohort you are NOT integrating before proceeding."
+      };
+    }
+  }
+  if (framework === "ios") {
+    const cocoapods = (readFileOrNull(p(root, "Podfile")) ?? "") + "\n" + (readFileOrNull(p(root, "Podfile.lock")) ?? "");
+    const spm = (readFileOrNull(p(root, "Package.swift")) ?? "") + "\n" + (readFileOrNull(p(root, "Package.resolved")) ?? "") + "\n" + (readFileOrNull(p(root, ".swiftpm/Package.resolved")) ?? "");
+    const major = matchMajor(cocoapods, /CometChatUIKitSwift[^,\n]*?[\s'"(](\d+)\./) ?? matchMajor(spm, /cometchatuikitswift[\s\S]{0,300}"version"\s*:\s*"(\d+)\./i) ?? matchMajor(spm, /CometChatUIKitSwift[\s\S]{0,200}from:\s*"(\d+)\./);
+    if (major != null && major !== 5) {
+      return {
+        kind: "kit-major-mismatch",
+        installed: `v${major}`,
+        expected: "v5",
+        detail: `Project pins CometChatUIKitSwift v${major}, but these skills target v5. Reconcile the pinned version before integrating.`
+      };
+    }
+  }
+  return null;
+}
+
+// src/detectors/coexistence.ts
+init_fs();
+function mergedDeps2(root) {
+  const pkg = readJsonOrNull(p(root, "package.json"));
+  if (!pkg) return {};
+  return { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
+}
+var NPM_COMPETITORS = {
+  sendbird: { name: "Sendbird", kind: "chat" },
+  "@sendbird/chat": { name: "Sendbird", kind: "chat" },
+  "sendbird-uikit": { name: "Sendbird UIKit", kind: "chat" },
+  "@sendbird/uikit-react": { name: "Sendbird UIKit", kind: "chat" },
+  "@sendbird/uikit-react-native": { name: "Sendbird UIKit", kind: "chat" },
+  "@sendbird/calls": { name: "Sendbird Calls", kind: "calling" },
+  "stream-chat": { name: "Stream Chat", kind: "chat" },
+  "stream-chat-react": { name: "Stream Chat", kind: "chat" },
+  "stream-chat-react-native": { name: "Stream Chat", kind: "chat" },
+  "stream-chat-expo": { name: "Stream Chat", kind: "chat" },
+  "@stream-io/video-react-sdk": { name: "Stream Video", kind: "calling" },
+  "@stream-io/video-react-native-sdk": { name: "Stream Video", kind: "calling" },
+  "twilio-chat": { name: "Twilio Conversations", kind: "chat" },
+  "@twilio/conversations": { name: "Twilio Conversations", kind: "chat" },
+  "twilio-video": { name: "Twilio Video", kind: "calling" },
+  pubnub: { name: "PubNub", kind: "chat" },
+  "@pubnub/chat": { name: "PubNub Chat", kind: "chat" },
+  talkjs: { name: "TalkJS", kind: "chat" },
+  "@talkjs/react": { name: "TalkJS", kind: "chat" },
+  "agora-rtc-sdk-ng": { name: "Agora", kind: "calling" },
+  "agora-rtc-react": { name: "Agora", kind: "calling" },
+  "react-native-agora": { name: "Agora", kind: "calling" },
+  "react-native-onesignal": { name: "OneSignal", kind: "push" },
+  "onesignal-cordova-plugin": { name: "OneSignal", kind: "push" },
+  "react-onesignal": { name: "OneSignal", kind: "push" }
+};
+var NATIVE_COMPETITORS = [
+  // Android (Gradle coordinates) + Flutter (pub names) + iOS (pod names)
+  { pattern: /com\.sendbird\.sdk|sendbird_(sdk|chat_sdk)|\bSendBirdSDK\b|\bSendbirdChatSDK\b/, name: "Sendbird", kind: "chat" },
+  { pattern: /io\.getstream:stream-chat-android|stream_chat_flutter|\bStreamChat\b/, name: "Stream Chat", kind: "chat" },
+  { pattern: /io\.getstream:stream-video-android|stream_video_flutter|\bStreamVideo\b/, name: "Stream Video", kind: "calling" },
+  { pattern: /com\.twilio:conversations|twilio_conversations|\bTwilioConversationsClient\b/, name: "Twilio Conversations", kind: "chat" },
+  { pattern: /com\.twilio:video|twilio_programmable_video|\bTwilioVideo\b/, name: "Twilio Video", kind: "calling" },
+  { pattern: /com\.pubnub:pubnub|pubnub_flutter|(^|\n)\s*pod\s+['"]PubNub['"]/, name: "PubNub", kind: "chat" },
+  { pattern: /io\.agora\.rtc:|agora_rtc_engine|\bAgoraRtcEngine_iOS\b/, name: "Agora", kind: "calling" },
+  { pattern: /com\.onesignal:OneSignal|onesignal_flutter|(^|\n)\s*pod\s+['"]OneSignal/, name: "OneSignal", kind: "push" }
+];
+function dedupeBy(items, key) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const it of items) {
+    const k = key(it);
+    if (seen.has(k)) continue;
+    seen.add(k);
+    out.push(it);
+  }
+  return out;
+}
+function nativeManifestText(root) {
+  return [
+    "build.gradle",
+    "build.gradle.kts",
+    "app/build.gradle",
+    "app/build.gradle.kts",
+    "android/app/build.gradle",
+    // Flutter / RN-bare android
+    "pubspec.yaml",
+    "Podfile",
+    "ios/Podfile",
+    // Flutter / RN ios
+    "Package.swift"
+  ].map((f) => readFileOrNull(p(root, f)) ?? "").join("\n");
+}
+var SERVICE_WORKER_PATHS = [
+  "public/sw.js",
+  "public/service-worker.js",
+  "public/serviceworker.js",
+  "public/firebase-messaging-sw.js",
+  "static/sw.js",
+  // Astro / SvelteKit static dir
+  "static/service-worker.js",
+  "src/service-worker.ts",
+  "src/service-worker.js",
+  "src/sw.ts",
+  "service-worker.js",
+  "sw.js"
+];
+function detectExistingFirebase(root, deps) {
+  if ("firebase" in deps || "@react-native-firebase/app" in deps || "@react-native-firebase/messaging" in deps) {
+    return true;
+  }
+  return pathExists(p(root, "google-services.json")) || pathExists(p(root, "app/google-services.json")) || pathExists(p(root, "android/app/google-services.json")) || pathExists(p(root, "GoogleService-Info.plist")) || pathExists(p(root, "ios/GoogleService-Info.plist")) || pathExists(p(root, "ios/Runner/GoogleService-Info.plist")) || pathExists(p(root, "public/firebase-messaging-sw.js"));
+}
+function detectCoexistence(root, _framework) {
+  const deps = mergedDeps2(root);
+  const found = [];
+  for (const [dep, meta] of Object.entries(NPM_COMPETITORS)) {
+    if (dep in deps) found.push({ name: meta.name, coordinate: dep, kind: meta.kind });
+  }
+  const nativeText = nativeManifestText(root);
+  if (nativeText.trim()) {
+    for (const c of NATIVE_COMPETITORS) {
+      if (c.pattern.test(nativeText)) {
+        found.push({ name: c.name, coordinate: c.name, kind: c.kind });
+      }
+    }
+  }
+  const competing_sdks = dedupeBy(found, (s) => `${s.name}:${s.kind}`);
+  const existing_firebase = detectExistingFirebase(root, deps);
+  const existing_service_workers = SERVICE_WORKER_PATHS.filter((rel) => pathExists(p(root, rel)));
+  return { competing_sdks, existing_firebase, existing_service_workers };
+}
+
 // src/detectors/compatibility.ts
 function computeCompatibility(fw) {
   const warnings = [];
@@ -1014,6 +1210,8 @@ async function runDetectors(root) {
   const package_manager = detectPackageManager(root);
   const credentials = detectCredentials(root, fw.env_prefix);
   const existing_integration = detectExistingIntegration(root);
+  const version_conflict = detectVersionConflict(root, fw.framework);
+  const coexistence = detectCoexistence(root, fw.framework);
   const compatibility = computeCompatibility(fw);
   const architecture_context = detectArchitectureContext(root);
   const project_name = detectProjectName(root);
@@ -1038,6 +1236,8 @@ async function runDetectors(root) {
     package_manager,
     credentials,
     existing_integration,
+    version_conflict,
+    coexistence,
     compatibility,
     architecture_context
   };
@@ -1153,6 +1353,32 @@ function printHumanReadable(r) {
       lines.push(`      - ${f}`);
     }
   }
+  if (r.version_conflict) {
+    lines.push("");
+    lines.push(`  \u26A0 VERSION CONFLICT (${r.version_conflict.kind}): ${r.version_conflict.installed}`);
+    lines.push(`    ${r.version_conflict.detail}`);
+    lines.push("    \u2192 Reconcile this BEFORE integrating; the dispatcher will stop and ask.");
+  }
+  const co = r.coexistence;
+  if (co && (co.competing_sdks.length > 0 || co.existing_firebase || co.existing_service_workers.length > 0)) {
+    lines.push("");
+    lines.push("  Coexistence (competing stack):");
+    if (co.competing_sdks.length > 0) {
+      lines.push("    \u26A0 Competing chat/calling/push SDK(s) detected:");
+      for (const s of co.competing_sdks) {
+        lines.push(`      - ${s.name} (${s.kind}) \u2014 ${s.coordinate}`);
+      }
+      lines.push("      \u2192 Dispatcher will ask: replace it, run alongside (namespaced), or switch fully?");
+    }
+    if (co.existing_firebase) {
+      lines.push("    \u26A0 Existing Firebase setup \u2014 CometChat push is FCM-based; reuse the same app,");
+      lines.push("      don't double-init, and merge (don't overwrite) firebase-messaging-sw.js.");
+    }
+    if (co.existing_service_workers.length > 0) {
+      lines.push("    \u26A0 Existing service worker(s) \u2014 web push must not clobber:");
+      for (const sw of co.existing_service_workers) lines.push(`      - ${sw}`);
+    }
+  }
   lines.push("");
   lines.push(`  Compatibility:     ${r.compatibility.supported ? "supported" : "NOT supported"}`);
   if (r.compatibility.warnings.length > 0) {
@@ -3455,10 +3681,10 @@ function checkChatInitBeforeCallsInit(root, family) {
   for (const f of files) {
     const content = readFileOrNull(p(root, f));
     if (!content) continue;
-    const chatInit = /CometChat(UIKit)?\.init|CometChat\.init\(/.exec(content);
-    const callsInit = /CometChatCalls\.init|CometChatUIKitCalls\.init/.exec(content);
+    const code = stripComments(content);
+    const chatInit = /CometChat(UIKit)?\.init|CometChat\.init\(/.exec(code);
+    const callsInit = /CometChatCalls\.init|CometChatUIKitCalls\.init/.exec(code);
     if (!chatInit || !callsInit) {
-      if (chatInit && !callsInit) return { status: "fail", reason: `${f}: chat init found but no Calls SDK init in same file` };
       continue;
     }
     if (chatInit.index < callsInit.index) return { status: "pass" };
@@ -3467,6 +3693,9 @@ function checkChatInitBeforeCallsInit(root, family) {
   return { status: "skip", reason: "no init file containing both Chat + Calls SDK init found" };
 }
 function checkIncomingCallRootMount(root, family) {
+  if ((family === "web" || family === "native" || family === "angular") && isSessionOnlyMode(root, family)) {
+    return { status: "skip", reason: "session/meeting mode \u2014 no incoming-call entity (joinSession; no ringing surface)" };
+  }
   if (pathExists(p(root, ".cometchat/builder.json"))) {
     const homeCandidates = [
       "src/CometChat/components/CometChatHome/CometChatHome.tsx",
@@ -3613,14 +3842,20 @@ function checkHangupTeardown(root, family) {
     }
   }
   const requiredByFamily = {
-    web: [/CometChatCalls\.(leaveSession|endSession)/, /\.getTracks\(\)\.forEach\([^)]*\.stop\(\)\)/],
+    web: [/CometChatCalls\.(leaveSession|endSession)/, /\.getTracks\(\)\.forEach\([\s\S]*?\.stop\(\s*\)\s*\)/],
     native: [/CometChatCalls\.(leaveSession|endSession)/, /RNCallKeep\.endCall/],
-    angular: [/CometChatCalls\.(leaveSession|endSession)/, /\.getTracks\(\)\.forEach\([^)]*\.stop\(\)\)/],
+    angular: [/CometChatCalls\.(leaveSession|endSession)/, /\.getTracks\(\)\.forEach\([\s\S]*?\.stop\(\s*\)\s*\)/],
     android: [/CallSession\.getInstance\(\)\.leaveSession|CometChatCalls\.endSession|CometChatUIKit\.endSession|leaveSession\(\)/, /stopService|stopForeground|finish\(\)/],
     ios: [/CallSession\.shared\.leaveSession|CometChatCalls\.(leaveSession|endSession)/, /setActive\(false[^)]*notifyOthersOnDeactivation/],
     flutter: [/CallSession\.getInstance\(\)\.leaveSession|CometChatUIKitCalls\.endSession|CometChatCalls\.(leaveSession|endSession)/, /FlutterCallkitIncoming\.endAllCalls|Navigator\.of\(.*\)\.pop|CometChatOngoingCallService\.abort/]
   };
-  const required = requiredByFamily[family];
+  let required = requiredByFamily[family];
+  if (family === "web" || family === "angular") {
+    const ownsMedia = anySourceFileMatches(root, family, /getUserMedia\s*\(/);
+    if (!ownsMedia) {
+      required = [/CometChatCalls\.(leaveSession|endSession)/];
+    }
+  }
   const exts = family === "ios" ? [".swift"] : family === "android" ? [".kt", ".java"] : family === "flutter" ? [".dart"] : [".ts", ".tsx", ".js", ".jsx"];
   const dirs = family === "ios" ? ["ios"] : family === "android" ? ["app/src/main"] : family === "flutter" ? ["lib"] : ["src", "app"];
   let foundAll = true;
@@ -3762,6 +3997,28 @@ function gatherSourceFiles(root, family) {
   const re = SOURCE_EXTS_FOR[family];
   return walkFiles(startDir, (name) => re.test(name));
 }
+function anySourceFileMatches(root, family, re) {
+  for (const file of gatherSourceFiles(root, family)) {
+    const content = readFileOrNull(file) ?? "";
+    if (re.test(content)) return true;
+  }
+  return false;
+}
+function isSessionOnlyMode(root, family) {
+  const usesSession = anySourceFileMatches(root, family, /CometChatCalls\.(joinSession|startSession)/);
+  if (!usesSession) return false;
+  const usesRinging = anySourceFileMatches(
+    root,
+    family,
+    /CometChatIncomingCall|CometChatOutgoingCall|cometchat-incoming-call|cometchat-outgoing-call|\.initiateCall\b/
+  );
+  return !usesRinging;
+}
+function hasChatSdkInPackage(root, family) {
+  const pkg = readFileOrNull(p(root, "package.json")) ?? "";
+  const chatSdkPkg = family === "native" ? "@cometchat/chat-sdk-react-native" : "@cometchat/chat-sdk-javascript";
+  return new RegExp(`"${chatSdkPkg.replace(/[/-]/g, "\\$&")}"`).test(pkg);
+}
 function checkEventListenerCleanup(root, family) {
   if (family === "ios" || family === "android" || family === "flutter") {
     return { status: "skip", reason: "native families use interface-based listeners, not addEventListener" };
@@ -3771,17 +4028,20 @@ function checkEventListenerCleanup(root, family) {
   for (const file of files) {
     const content = readFileOrNull(file) ?? "";
     if (!/CometChatCalls\.addEventListener/.test(content)) continue;
+    const hasLegacyRemove = /CometChatCalls\.removeEventListener\s*\(/.test(content);
+    const hasAbortSignal = /addEventListener\s*\([\s\S]*?\bsignal\b/.test(content) || /AbortController/.test(content);
+    const capturesReturn = /(?:const|let|var)\s+\w+\s*(?::[^=\n]+)?=\s*CometChatCalls\.addEventListener/.test(content) || /(?:const|let|var)\s+\w+\s*(?::[^=\n]+)?=\s*\[[\s\S]*?CometChatCalls\.addEventListener/.test(content) || /return\s+CometChatCalls\.addEventListener/.test(content);
+    const invokesUnsub = /\b\w*off\w*\s*\(\s*\)/i.test(content) || /=>\s*\w+\s*\(\s*\)/.test(content) || /\.forEach\(\s*\(?\s*\w+\s*\)?\s*=>/.test(content);
+    if (hasLegacyRemove || hasAbortSignal || capturesReturn && invokesUnsub) continue;
     const adds = [...content.matchAll(/CometChatCalls\.addEventListener\(\s*["']([\w-]+)["']/g)].map((m) => m[1]);
-    const removes = [...content.matchAll(/CometChatCalls\.removeEventListener\(\s*["']([\w-]+)["']/g)].map((m) => m[1]);
-    const missing = adds.filter((evt) => !removes.includes(evt));
-    if (missing.length > 0) {
-      offenders.push(`${file.replace(root + "/", "")}: missing removeEventListener for [${[...new Set(missing)].join(", ")}]`);
-    }
+    offenders.push(
+      `${file.replace(root + "/", "")}: addEventListener (${[...new Set(adds)].join(", ")}) without invoking the returned unsubscribe \u2014 v5 returns an off() fn; call it in teardown`
+    );
   }
   if (offenders.length === 0) return { status: "pass" };
   return {
     status: "fail",
-    reason: `${offenders.length} file(s) call addEventListener without a matching removeEventListener \u2014 listener leak`,
+    reason: `${offenders.length} file(s) call addEventListener without invoking the returned unsubscribe \u2014 listener leak`,
     details: offenders.slice(0, 5).join("\n")
   };
 }
@@ -3946,7 +4206,7 @@ function checkVirtualBgPlatformGate(root, family) {
   if (family === "web" || family === "angular") return { status: "skip", reason: "platform supports virtual background" };
   const files = gatherSourceFiles(root, family);
   for (const file of files) {
-    const content = readFileOrNull(file) ?? "";
+    const content = stripComments(readFileOrNull(file) ?? "");
     if (/hideVirtualBackgroundButton\s*[:=]\s*false/i.test(content) || /setHideVirtualBackgroundButton\(\s*false\s*\)/i.test(content)) {
       return {
         status: "fail",
@@ -3960,12 +4220,15 @@ function checkGroupAsSessionHelper(root, family) {
   if (family === "ios" || family === "android" || family === "flutter") {
     return { status: "skip", reason: "currently only checked for JS families" };
   }
+  if (!hasChatSdkInPackage(root, family)) {
+    return { status: "skip", reason: "no Chat SDK in project \u2014 calls-only session mode; in-call chat uses the Calls SDK's built-in chat, no CometChat group needed" };
+  }
   const files = gatherSourceFiles(root, family);
   let usesInCallChat = false;
   let hasGroupHelper = false;
   for (const file of files) {
     const content = readFileOrNull(file) ?? "";
-    if (/onChatButtonClicked|hideChatButton\s*[:=]\s*false/.test(content)) usesInCallChat = true;
+    if (/hideChatButton\s*[:=]\s*false/.test(content)) usesInCallChat = true;
     if (/createGroup|ensureCallGroup|ensureGroup|getGroup\s*\(/.test(content)) hasGroupHelper = true;
   }
   if (!usesInCallChat) return { status: "skip", reason: "in-call chat not wired" };
@@ -3977,7 +4240,7 @@ function checkCallTokenServerSide(root, family) {
   }
   const files = gatherSourceFiles(root, family);
   for (const file of files) {
-    const content = readFileOrNull(file) ?? "";
+    const content = stripComments(readFileOrNull(file) ?? "");
     if (/COMETCHAT_AUTH_KEY|cometchat[_.]?auth[_.]?key/i.test(content) && /generateToken|callToken|getCallToken/i.test(content)) {
       return {
         status: "fail",
@@ -4086,6 +4349,9 @@ function checkRecordingConsentUi(root, family) {
     reason: "recording is enabled but no consent/notice UI found in source \u2014 required for two-party-consent jurisdictions"
   };
 }
+function stripComments(src) {
+  return src.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|[^:])\/\/[^\n]*/g, "$1");
+}
 function checkNoStaleSdkApis(root, family) {
   const exts = family === "ios" ? [".swift"] : family === "android" ? [".kt", ".java"] : family === "flutter" ? [".dart"] : [".ts", ".tsx", ".js", ".jsx"];
   const dirs = family === "ios" ? ["ios"] : family === "android" ? ["app/src/main"] : family === "flutter" ? ["lib"] : ["src", "app"];
@@ -4135,7 +4401,7 @@ function checkNoStaleSdkApis(root, family) {
         if (isDirectory(ep)) {
           if (!entry.startsWith(".") && entry !== "node_modules" && entry !== "Pods" && entry !== "build" && entry !== ".dart_tool") stack.push(ep);
         } else if (exts.some((e) => entry.endsWith(e))) {
-          const content = readFileOrNull(ep) ?? "";
+          const content = stripComments(readFileOrNull(ep) ?? "");
           for (const { pattern, reason } of banned) {
             if (pattern.test(content)) {
               violations.push(`${ep.replace(root + "/", "")}: ${reason}`);
@@ -7009,6 +7275,10 @@ async function getCurrentUserWithLastApp(host, token) {
   }
   return { ...user, last_app };
 }
+function isExtensionEnabled(e) {
+  if (!e) return false;
+  return e.enabled === 1 || e.enabled === true || e.isActive === true || e.status === "enabled";
+}
 async function listInstalledExtensions(host, token, appId) {
   const res = await request(
     host,
@@ -7040,7 +7310,7 @@ async function toggleExtension(host, token, appId, extensionId, action) {
   }
 }
 async function toggleAiFeature(host, token, appId, featureKey, action) {
-  const path = `/apps/${encodeURIComponent(appId)}/features/ai.${encodeURIComponent(featureKey)}/enabled`;
+  const path = `/apps/${encodeURIComponent(appId)}/features/${encodeURIComponent(featureKey)}/enabled`;
   const res = await request(host, path, {
     method: action === "enable" ? "POST" : "DELETE",
     headers: { Authorization: `Bearer ${token}` },
@@ -7516,6 +7786,8 @@ async function featuresToggle(args, featureName, action) {
   }
   const verb = action === "enable" ? "Enabled" : "Disabled";
   const autoWiredNote = match.auto_wired_in_uikit === true ? " The UI Kit's initiateAfterLogin() auto-attaches the decorator, so a browser refresh is all you need." : " Register the extension via UIKitSettingsBuilder.setExtensions([...]) if you haven't already \u2014 the toggle alone isn't enough for non-default extensions. Query the docs MCP for the exact builder syntax.";
+  const codeNote = match.code === "custom-code" ? `This feature needs CUSTOM CLIENT CODE (tier 5). The reference implementation is in the docs (${match.docs_topic ?? "ui-kit/react/extensions"}) \u2014 fetch it via the docs MCP and adapt it; do NOT hand-roll.` : match.code === "steps-in-docs" ? `This feature needs client wiring \u2014 follow the documented steps at ${match.docs_topic ?? "ui-kit/react/extensions"} (query the docs MCP).` : match.code === "stitch-components" ? "This feature is surfaced by COMPOSING existing UI Kit components \u2014 see the kit sample app for the wiring pattern." : "";
+  const settingsNote = match.dashboard_settings ? `Additional dashboard setup required: ${match.dashboard_settings}.` : "";
   const result = {
     status: action === "enable" ? "enabled" : "disabled",
     feature: match,
@@ -7523,8 +7795,10 @@ async function featuresToggle(args, featureName, action) {
     next_steps: [
       `${verb} ${match.name} on app ${appId}.`,
       "Hard-refresh (Cmd+Shift+R / Ctrl+Shift+R) the browser tab running your dev server to pick up the change.",
-      autoWiredNote.trim()
-    ]
+      autoWiredNote.trim(),
+      settingsNote,
+      codeNote
+    ].filter(Boolean)
   };
   if (json) {
     console.log(JSON.stringify(result, null, 2));
@@ -8919,7 +9193,7 @@ async function applyFeature(args) {
         ],
         "dashboard-only": [
           `${feature.name} is configured manually in the dashboard. Disable it there:`,
-          feature.dashboard_path ? `  Dashboard \u2192 ${feature.dashboard_path} \u2192 Disable` : `  Dashboard \u2192 Extensions \u2192 ${feature.name} \u2192 Disable`
+          feature.dashboard_path ? `  Dashboard \u2192 ${feature.dashboard_path} \u2192 Disable` : `  Dashboard \u2192 Chat & Messaging \u2192 Features \u2192 ${feature.name} \u2192 Disable`
         ],
         "package-install": [
           `${feature.name} required installing a package. To remove:`,
@@ -9075,6 +9349,7 @@ async function applyModeration(args, result, root, state2, explicitAppId, featur
   result.feature_type = "moderation";
   result.next_steps = [
     `${feature.name} configured and enabled on app ${appId}. Config keys: ${Object.keys(config2).join(", ")}.`,
+    "\u26A0\uFE0F LEGACY moderation extension. The canonical moderation system is now Rules Management (Dashboard \u2192 Moderation \u2192 Settings \u2192 Rules, or the /moderation/rules REST API) \u2014 rules auto-apply to all messages with no client code. If you use moderation Rules, DISABLE legacy extensions like this one first: running BOTH double-processes every message (delays + perf issues). See docs/moderation/overview.",
     ...feature.docs_topic ? [`Docs: https://www.cometchat.com/docs/ui-kit/react/${feature.docs_topic}`] : []
   ];
   return outputResult11(args, result, 0);
@@ -9230,11 +9505,31 @@ async function applyExtensionToggle(args, result, root, state2, explicitAppId, f
     return outputResult11(args, result, 1);
   }
   const remove = args.flags.remove === true || args.flags.remove === "true";
+  const extensionKey = feature.extension_id ?? feature.id;
   try {
-    await toggleExtension(host, creds.token, appId, feature.id, remove ? "disable" : "enable");
+    await toggleExtension(host, creds.token, appId, extensionKey, remove ? "disable" : "enable");
   } catch (err) {
     return handleApiError(args, result, err, feature);
   }
+  let lagWarning = null;
+  try {
+    const installed = await listInstalledExtensions(host, creds.token, appId);
+    const match = installed.find((e) => e.id === extensionKey);
+    if (!remove && !match) {
+      result.status = "error";
+      result.error = `The dashboard accepted the request but extension "${extensionKey}" did not appear in this app's extension list afterward \u2014 the extension key is wrong for this feature, or it isn't available on your plan.`;
+      const enabledNow = installed.filter((e) => isExtensionEnabled(e)).map((e) => e.id).join(", ") || "(none)";
+      result.next_steps = [
+        `Extensions currently enabled on this app: ${enabledNow}.`,
+        `Confirm "${feature.name}" is available on your plan (dashboard \u2192 Chat & Messaging \u2192 Features), then retry.`
+      ];
+      return outputResult11(args, result, 1);
+    }
+    if (!remove && match && !isExtensionEnabled(match)) {
+      lagWarning = `Note: the toggle was accepted but the dashboard does not yet report "${feature.name}" as enabled. This is usually propagation lag \u2014 re-check in the dashboard (Chat & Messaging \u2192 Features) in a moment; re-run this command if it hasn't flipped.`;
+    }
+  } catch {
+  }
   if (state2) {
     if (remove) {
       state2.applied_features = (state2.applied_features ?? []).filter((f) => f !== feature.id);
@@ -9247,7 +9542,7 @@ async function applyExtensionToggle(args, result, root, state2, explicitAppId, f
       summary: `${remove ? "Disabled" : "Enabled"} extension "${feature.name}" via dashboard API on app ${appId}`,
       inputs: { feature: feature.id, appId, remove },
       decisions: {
-        api_endpoint: `POST /apps/${appId}/extensions { ${remove ? "disabled" : "enabled"}: ["${feature.id}"] }`,
+        api_endpoint: `POST /apps/${appId}/extensions { ${remove ? "disabled" : "enabled"}: ["${extensionKey}"] }`,
         auto_wired: feature.auto_wired_in_uikit ? "yes" : "no"
       },
       files_modified: [],
@@ -9265,6 +9560,7 @@ async function applyExtensionToggle(args, result, root, state2, explicitAppId, f
     feature.auto_wired_in_uikit ? "The UI Kit's defaultExtensions[] picks this up automatically \u2014 refresh the browser." : "Refresh the chat in the browser. If the feature requires UIKitSettingsBuilder.setExtensions([...]), see the docs link below.",
     ...feature.docs_topic ? [`Docs: https://www.cometchat.com/docs/ui-kit/react/${feature.docs_topic}`] : []
   ];
+  if (lagWarning) result.next_steps = [lagWarning, ...result.next_steps];
   return outputResult11(args, result, 0);
 }
 async function applyAiFeatureToggle(args, result, root, state2, explicitAppId, feature) {
@@ -9335,7 +9631,7 @@ async function applyAiFeatureToggle(args, result, root, state2, explicitAppId, f
       inputs: { feature: feature.id, appId, openai_key_written: !remove && needsKeyWrite, remove },
       decisions: {
         settings_endpoint: !remove && needsKeyWrite ? `PUT /apps/${appId}/ai/settings { openAIKey: "(redacted)" }` : "skipped",
-        toggle_endpoint: `${remove ? "DELETE" : "POST"} /apps/${appId}/features/ai.${feature.ai_key}/enabled`
+        toggle_endpoint: `${remove ? "DELETE" : "POST"} /apps/${appId}/features/${feature.ai_key}/enabled`
       },
       files_modified: [],
       next_actions: [
@@ -9359,7 +9655,7 @@ function applyDashboardOnly(args, result, feature) {
   result.status = "manual-action-required";
   result.error = `${feature.name} requires config beyond a boolean toggle (third-party API key or multi-field setup).`;
   result.next_steps = [
-    feature.dashboard_path ? `In the dashboard at https://app.cometchat.com \u2192 ${feature.dashboard_path}` : `Open https://app.cometchat.com and configure ${feature.name} on the Extensions page.`,
+    feature.dashboard_path ? `In the dashboard at https://app.cometchat.com \u2192 ${feature.dashboard_path}` : `Open https://app.cometchat.com and configure ${feature.name} on the Chat & Messaging \u2192 Features page.`,
     ...feature.docs_topic ? [`Docs: https://www.cometchat.com/docs/ui-kit/react/${feature.docs_topic}`] : []
   ];
   return outputResult11(args, result, 1);
@@ -11794,6 +12090,32 @@ import { spawnSync as spawnSync5 } from "node:child_process";
 import { tmpdir } from "node:os";
 init_config();
 init_fs();
+var BUILDER_TOGGLE_TO_DASHBOARD_FEATURE = {
+  deeperUserEngagement: {
+    messageTranslation: { id: "message-translation", type: "extension" },
+    polls: { id: "polls", type: "extension" },
+    collaborativeWhiteboard: { id: "collaborative-whiteboard", type: "extension" },
+    collaborativeDocument: { id: "collaborative-document", type: "extension" },
+    stickers: { id: "stickers", type: "extension" }
+  },
+  aiUserCopilot: {
+    conversationStarter: { id: "conversation-starter", type: "ai-feature" },
+    conversationSummary: { id: "conversation-summary", type: "ai-feature" },
+    smartReply: { id: "smart-replies", type: "ai-feature" }
+  }
+};
+function dashboardSetupNeeded(chatFeatures) {
+  const out = [];
+  if (!chatFeatures) return out;
+  for (const [section, keyMap] of Object.entries(BUILDER_TOGGLE_TO_DASHBOARD_FEATURE)) {
+    const block = chatFeatures[section];
+    if (!block || typeof block !== "object") continue;
+    for (const [builderKey, feat] of Object.entries(keyMap)) {
+      if (block[builderKey] === true) out.push({ ...feat, builderKey, section });
+    }
+  }
+  return out;
+}
 var HELP20 = `
 cometchat builder \u2014 manage Visual Chat Builders for an app
 
@@ -12120,6 +12442,11 @@ var PLATFORM_LAYOUTS = {
     // the JSON settings. SKILL.md §"Visual Builder integration" lists
     // these as verbatim copies. ThreadedMessagesVC.swift is included
     // because MessagesVC.swift imports it.
+    // BUILD-BREAKER (ENG-35337): the verbatim ThreadedMessagesVC.swift reads
+    // CometChatBuilderSettings.shared.layout.compactMessageComposer, which is
+    // MISSING in CometChatBuilder <= 1.1.2 -> compile failure. Pin
+    // `pod 'CometChatBuilder', '> 1.1.2'` (SPM: from: "1.1.3"). The reference
+    // app's Podfile is unversioned -- that's the trap, not the fix.
     files: [
       {
         zipPath: "CometChatBuilderSwift/BuilderApp/View Controllers/CometChat Components/MessagesVC.swift",
@@ -12286,7 +12613,9 @@ async function builderExport(args) {
   }
   const layout = PLATFORM_LAYOUTS[platform];
   if (!layout) {
-    const msg = `\`builder export --platform ${platform}\` is not yet implemented. v4.3.0 ships React only. For ${platform}, follow the manual recipe in cometchat-{${platform === "react-native" ? "native" : platform === "ios" ? "ios" : platform}}-core/SKILL.md \xA7"Visual Builder integration".`;
+    const supported = Object.keys(PLATFORM_LAYOUTS).join(", ");
+    const coreSkill = platform === "react-native" ? "native" : platform;
+    const msg = `\`builder export --platform ${platform}\` is not yet implemented (supported: ${supported}). For ${platform}, follow the manual recipe in cometchat-${coreSkill}-core/SKILL.md \xA7"Visual Builder integration".`;
     if (json) return emitError(true, msg);
     console.error(msg);
     return 1;
@@ -12360,6 +12689,7 @@ async function builderExport(args) {
     const due = chatFeatures.deeperUserEngagement;
     if (due && due.mentionAll === void 0) due.mentionAll = true;
   }
+  const needSetup = dashboardSetupNeeded(chatFeatures);
   const tmpRoot = mkdtempSync(join18(tmpdir(), "cometchat-builder-export-"));
   const tmpZip = join18(tmpRoot, `cometchat-builder-${platform}.zip`);
   const tmpExtract = join18(tmpRoot, "extracted");
@@ -12381,9 +12711,7 @@ async function builderExport(args) {
     }
     const settingsContent = (() => {
       if (layout.format === "ts-export") {
-        const body2 = `export const CometChatSettings = ${JSON.stringify(settings, null, 2)};
-`;
-        return layout.sentinel ? injectSentinel(body2, builderId) : body2;
+        return `export const CometChatSettings: CometChatSettingsInterface = ${JSON.stringify(settings, null, 2)};`;
       }
       const nowSec = Math.floor(Date.now() / 1e3);
       const envelope = {
@@ -12419,7 +12747,15 @@ async function builderExport(args) {
         console.error(msg);
         return 1;
       }
-      writeFileSync10(settingsPath, settingsContent);
+      if (layout.format === "ts-export") {
+        const existing = readFileSync16(settingsPath, "utf8");
+        const constRe = /export const CometChatSettings(?::\s*[A-Za-z_][\w]*)?\s*=\s*\{[\s\S]*?\n\};/;
+        let patched = constRe.test(existing) ? existing.replace(constRe, settingsContent) : existing.replace(/\n*$/, "\n\n") + settingsContent + "\n";
+        if (layout.sentinel) patched = injectSentinel(patched, builderId);
+        writeFileSync10(settingsPath, patched);
+      } else {
+        writeFileSync10(settingsPath, settingsContent);
+      }
       primarySettingsFile = settingsPath;
     } else {
       if (existsSync4(outputAbs) && force) rmSync3(outputAbs, { recursive: true, force: true });
@@ -12470,7 +12806,12 @@ async function builderExport(args) {
             platform,
             output: outputAbs,
             settings_file: primarySettingsFile,
-            builder_name: builderName
+            builder_name: builderName,
+            // Toggled-ON builder features that ALSO need dashboard enablement
+            // (extension / AI key). Empty array = nothing extra to enable. The
+            // dispatcher runs `cometchat apply-feature <id>` for each `extension`
+            // and prompts for an OpenAI key for each `ai-feature`.
+            dashboardSetupNeeded: needSetup
           },
           null,
           2
@@ -12480,6 +12821,15 @@ async function builderExport(args) {
       console.log(`\u2713 Builder exported: ${builderId} \u2192 ${outputAbs}`);
       console.log(`  Settings:  ${primarySettingsFile}${layout.sentinel ? " (patched + sentinel)" : " (patched)"}`);
       console.log(`  Platform:  ${platform}`);
+      if (needSetup.length) {
+        console.log("");
+        console.log("  \u26A0 These features are ON in your builder but also need DASHBOARD setup");
+        console.log("    (the builder shows their UI; the server-side capability is separate):");
+        for (const f of needSetup) {
+          const how = f.type === "ai-feature" ? `cometchat apply-feature ${f.id} --openai-key sk-...` : `cometchat apply-feature ${f.id}`;
+          console.log(`      \u2022 ${f.id}  \u2192  ${how}`);
+        }
+      }
       console.log("");
       console.log("Resync later by re-running this exact command \u2014 `--force` to replace.");
     }