fix: scope selected global web subscriptions

steipete · steipete · commit 6006871d80f9 · 2026-05-29T22:15:34.000+02:00
diff --git a/ui/src/ui/controllers/sessions.test.ts b/ui/src/ui/controllers/sessions.test.ts
@@ -154,6 +154,48 @@ describe("syncSelectedSessionMessageSubscription", () => {
     expect(state.chatSessionMessageSubscriptionAgentId).toBe("work");
   });
 
+  it("keeps agent-scoped global alias subscriptions scoped for unsubscribe", async () => {
+    const request = vi.fn(async (method: string) =>
+      method === "sessions.messages.subscribe" ? { key: "global" } : { subscribed: false },
+    );
+    const state = createState(request, {
+      sessionKey: "agent:work:main",
+      assistantAgentId: "main",
+      sessionsResult: {
+        ts: 1,
+        path: "/tmp/sessions.json",
+        count: 2,
+        sessions: [
+          { key: "agent:work:main", kind: "global", updatedAt: 2 },
+          { key: "agent:ops:main", kind: "global", updatedAt: 1 },
+        ],
+        defaults: { modelProvider: null, model: null, contextTokens: null },
+        totalCount: 2,
+        limit: 50,
+        offset: 0,
+        hasMore: false,
+      },
+    } as Partial<SessionsState & { sessionKey: string }>) as SessionsState & { sessionKey: string };
+
+    await syncSelectedSessionMessageSubscription(state);
+    state.sessionKey = "agent:ops:main";
+    await syncSelectedSessionMessageSubscription(state);
+
+    expect(request).toHaveBeenNthCalledWith(1, "sessions.messages.subscribe", {
+      key: "agent:work:main",
+      agentId: "work",
+    });
+    expect(request).toHaveBeenNthCalledWith(2, "sessions.messages.unsubscribe", {
+      key: "global",
+      agentId: "work",
+    });
+    expect(request).toHaveBeenNthCalledWith(3, "sessions.messages.subscribe", {
+      key: "agent:ops:main",
+      agentId: "ops",
+    });
+    expect(state.chatSessionMessageSubscriptionAgentId).toBe("ops");
+  });
+
   it("uses the hello default agent for global subscriptions before agents load", async () => {
     const request = vi.fn(async () => ({ key: "global" }));
     const state = createState(request, {
diff --git a/ui/src/ui/controllers/sessions.ts b/ui/src/ui/controllers/sessions.ts
@@ -99,6 +99,35 @@ function isGlobalSessionKey(value: string | null | undefined): boolean {
   return (value ?? "").trim().toLowerCase() === "global";
 }
 
+function resolveSelectedGlobalAliasAgentId(
+  state: SessionsState,
+  key: string | null | undefined,
+): string | null {
+  const parsed = parseAgentSessionKey(key);
+  if (!parsed?.agentId) {
+    return null;
+  }
+  const rest = parsed.rest.toLowerCase();
+  if (rest === "global") {
+    return normalizeAgentId(parsed.agentId);
+  }
+  if (rest !== "main") {
+    return null;
+  }
+  const row = state.sessionsResult?.sessions.find((session) => session.key === key);
+  return row?.kind === "global" ? normalizeAgentId(parsed.agentId) : null;
+}
+
+function resolveSelectedSessionMessageSubscriptionAgentId(
+  state: SessionsState,
+  key: string,
+): string | null {
+  if (isGlobalSessionKey(key)) {
+    return resolveSelectedGlobalAgentId(state);
+  }
+  return resolveSelectedGlobalAliasAgentId(state, key);
+}
+
 function resolveSelectedGlobalAgentId(state: SessionsState): string {
   const parsed = parseAgentSessionKey(state.sessionKey);
   if (parsed?.agentId) {
@@ -158,16 +187,18 @@ function sessionsChangedGlobalAgentMatches(
 }
 
 function buildSelectedSessionMessageSubscriptionParams(state: SessionsState, key: string) {
+  const agentId = resolveSelectedSessionMessageSubscriptionAgentId(state, key);
   return {
     key,
-    ...(isGlobalSessionKey(key) ? { agentId: resolveSelectedGlobalAgentId(state) } : {}),
+    ...(agentId ? { agentId } : {}),
   };
 }
 
 function buildSelectedSessionRequestParams(state: SessionsState, key: string) {
+  const agentId = resolveSelectedSessionMessageSubscriptionAgentId(state, key);
   return {
     key,
-    ...(isGlobalSessionKey(key) ? { agentId: resolveSelectedGlobalAgentId(state) } : {}),
+    ...(agentId ? { agentId } : {}),
   };
 }
 
@@ -192,8 +223,8 @@ function isCurrentSelectedSessionMessageSubscriptionSync(
     state.client === params.client &&
     state.connected &&
     state.sessionKey.trim() === params.requestedKey &&
-    (!isGlobalSessionKey(params.requestedKey) ||
-      resolveSelectedGlobalAgentId(state) === (params.requestedAgentId ?? null))
+    resolveSelectedSessionMessageSubscriptionAgentId(state, params.requestedKey) ===
+      (params.requestedAgentId ?? null)
   );
 }
 
@@ -677,11 +708,9 @@ export async function syncSelectedSessionMessageSubscription(
   );
   const previousCanonicalKey = normalizeSubscriptionKey(state.chatSessionMessageSubscriptionKey);
   const previousSelectedKey = previousRequestedKey ?? previousCanonicalKey;
-  const nextSubscriptionAgentId = isGlobalSessionKey(nextKey)
-    ? resolveSelectedGlobalAgentId(state)
-    : null;
+  const nextSubscriptionAgentId = resolveSelectedSessionMessageSubscriptionAgentId(state, nextKey);
   const selectedAgentChanged =
-    isGlobalSessionKey(nextKey) &&
+    nextSubscriptionAgentId !== null &&
     previousSelectedKey === nextKey &&
     (state.chatSessionMessageSubscriptionAgentId ?? null) !== nextSubscriptionAgentId;
   const selectedKeyChanged = previousSelectedKey !== null && previousSelectedKey !== nextKey;
