fix(ui): propagate group catalog changes to open clients

steipete · steipete · commit d79a2a6bf18e · 2026-07-10T02:37:49.000-07:00
sessions.groups.put/rename/delete now always broadcast a groups-change event, and the session capability reloads the gateway-owned catalog when one arrives, so another browser's group create/reorder/rename/delete no longer leaves this client on a stale snapshot for the rest of the connection. Part of #103431
diff --git a/src/gateway/server-methods/sessions.ts b/src/gateway/server-methods/sessions.ts
@@ -2612,13 +2612,15 @@ export const sessionsHandlers: GatewayRequestHandlers = {
     }
     respond(true, { groups: listSessionGroups() }, undefined);
   },
-  "sessions.groups.put": async ({ params, respond }) => {
+  "sessions.groups.put": async ({ params, respond, context }) => {
     if (
       !assertValidParams(params, validateSessionsGroupsPutParams, "sessions.groups.put", respond)
     ) {
       return;
     }
     respond(true, { ok: true, groups: putSessionGroups(params.names) }, undefined);
+    // Catalog-only changes still need to reach other open clients.
+    emitSessionsChanged(context, { reason: "groups" });
   },
   "sessions.groups.rename": async ({ params, respond, context }) => {
     if (
@@ -2638,9 +2640,7 @@ export const sessionsHandlers: GatewayRequestHandlers = {
         to: params.to,
       });
       respond(true, { ok: true, ...result }, undefined);
-      if (result.updatedSessions > 0) {
-        emitSessionsChanged(context, { reason: "groups" });
-      }
+      emitSessionsChanged(context, { reason: "groups" });
     } catch (error) {
       respond(false, undefined, errorShape(ErrorCodes.UNAVAILABLE, formatErrorMessage(error)));
     }
@@ -2662,9 +2662,7 @@ export const sessionsHandlers: GatewayRequestHandlers = {
         name: params.name,
       });
       respond(true, { ok: true, ...result }, undefined);
-      if (result.updatedSessions > 0) {
-        emitSessionsChanged(context, { reason: "groups" });
-      }
+      emitSessionsChanged(context, { reason: "groups" });
     } catch (error) {
       respond(false, undefined, errorShape(ErrorCodes.UNAVAILABLE, formatErrorMessage(error)));
     }
diff --git a/ui/src/lib/sessions/index.ts b/ui/src/lib/sessions/index.ts
@@ -1279,6 +1279,14 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
         showArchived: lastListOptions.showArchived,
       });
       const eventInfo = readSessionChangedEvent(event.payload);
+      // Catalog mutations from other clients invalidate the per-connection
+      // groups snapshot. Groups events carry no session key, so read the
+      // reason straight off the payload instead of the parsed row info.
+      const eventReason = (event.payload as { reason?: unknown } | null)?.reason;
+      if (eventReason === "groups") {
+        groupsLoadedEpoch = -1;
+        void groupsLoad();
+      }
       const hasActiveRun = reconciled.hasActiveRun ?? eventInfo?.hasActiveRun;
       const status = reconciled.status ?? eventInfo?.status;
       const runEnded =
