@remits/remits-cli 0.1.107 → 0.1.108

package/index.js

@@ -1329,12 +1329,28 @@ function serviceRegistrationState() {
 
 function listenerRegistrationPayload(session, options = {}) {
   const service = serviceRegistrationState();
+  const groupedSessions = Array.isArray(options.groupedSessions)
+    ? options.groupedSessions.filter((entry) => entry && entry.token)
+    : [];
+  const sessionDataModes = Array.from(new Set(
+    (groupedSessions.length ? groupedSessions : [session])
+      .map((entry) => normalizeDataMode(entry && entry.dataMode))
+      .filter(Boolean)
+  )).sort();
+  const sessionAccountIds = Array.from(new Set(
+    (groupedSessions.length ? groupedSessions : [session])
+      .map((entry) => Number(entry && entry.accountId))
+      .filter((accountId) => Number.isFinite(accountId) && accountId > 0)
+  )).sort((a, b) => a - b);
   return {
     client: 'remits-cli',
     reason: options.reason || 'heartbeat',
     baseUrl: normalizeBaseUrl(session.baseUrl || DEFAULT_BASE_URL),
     accountId: Number(session.accountId),
     dataMode: normalizeDataMode(session.dataMode),
+    dataModes: sessionDataModes,
+    sessionAccountIds,
+    registrationSessionCount: groupedSessions.length || 1,
     websocketTopic: session.websocketTopic || (session.user && session.user.uuid ? String(session.user.uuid).replace(/-/g, '') : null),
     dashboardUrl: service.dashboardUrl || null,
     agent: getPreferredAgent(),
@@ -1348,6 +1364,8 @@ function listenerRegistrationSignature(payload) {
     baseUrl: payload.baseUrl,
     accountId: payload.accountId,
     dataMode: payload.dataMode,
+    dataModes: payload.dataModes || [],
+    sessionAccountIds: payload.sessionAccountIds || [],
     websocketTopic: payload.websocketTopic,
     dashboardUrl: payload.dashboardUrl,
     agent: payload.agent,
@@ -1386,6 +1404,9 @@ function rememberCliListenerRegistration(session, payload) {
     userId: session.user && session.user.id ? session.user.id : null,
     signature: listenerRegistrationSignature(payload),
     accountCount: Array.isArray(payload.repoAccounts) ? payload.repoAccounts.length : 0,
+    sessionAccountIds: payload.sessionAccountIds || [],
+    dataModes: payload.dataModes || [],
+    registrationSessionCount: payload.registrationSessionCount || 1,
     lastRegisteredAt: new Date().toISOString(),
     lastRegisteredAtMs: Date.now()
   };
@@ -1412,17 +1433,44 @@ async function bestEffortRegisterCliListeners(options = {}) {
   if (!sessions.length) {
     return [];
   }
-  const results = await Promise.all(sessions.map(async (session) => {
+  const groupedSessions = [];
+  for (const session of sessions) {
+    const key = listenerRegistrationStateKey(session);
+    let group = groupedSessions.find((entry) => entry.key === key);
+    if (!group) {
+      group = { key, session, sessions: [] };
+      groupedSessions.push(group);
+    }
+    group.sessions.push(session);
+  }
+
+  const results = await Promise.all(groupedSessions.map(async (group) => {
     try {
-      const data = await registerCliListenerSession(session, options);
-      return { success: true, accountId: session.accountId, baseUrl: session.baseUrl, data };
+      const data = await registerCliListenerSession(group.session, {
+        ...options,
+        groupedSessions: group.sessions
+      });
+      return {
+        success: true,
+        accountId: group.session.accountId,
+        baseUrl: group.session.baseUrl,
+        groupedAccountIds: group.sessions.map((session) => session.accountId),
+        data
+      };
     } catch (err) {
       appendGlobalActivityLog('listener', 'registration.failed', {
-        accountId: session.accountId,
-        baseUrl: normalizeBaseUrl(session.baseUrl || DEFAULT_BASE_URL),
+        accountId: group.session.accountId,
+        baseUrl: normalizeBaseUrl(group.session.baseUrl || DEFAULT_BASE_URL),
+        groupedAccountIds: group.sessions.map((session) => session.accountId),
         error: describeError(err)
       }, 'error');
-      return { success: false, accountId: session.accountId, baseUrl: session.baseUrl, error: describeError(err) };
+      return {
+        success: false,
+        accountId: group.session.accountId,
+        baseUrl: group.session.baseUrl,
+        groupedAccountIds: group.sessions.map((session) => session.accountId),
+        error: describeError(err)
+      };
     }
   }));
   return results;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remits/remits-cli",
-  "version": "0.1.107",
+  "version": "0.1.108",
   "description": "Local CLI for auth, component sync, and live test execution against Remits",
   "license": "MIT",
   "private": false,