revert: remove SSE split-subscription changes that belong to PR tiann#694

The following files were accidentally included from work intended for a
separate PR (session-list-status / SSE split subscriptions) due to that
branch being submitted from main rather than its own worktree branch:

- web/src/App.tsx (reverted to upstream/main)
- web/src/hooks/useSSE.ts (reverted to upstream/main)
- web/src/hooks/useSSE.test.ts (removed — added by other branch)
- web/src/lib/appSseSubscriptions.ts (removed — added by other branch)
- web/src/lib/appSseSubscriptions.test.ts (removed — added by other branch)
- hub/src/sync/syncEngine.ts (reverted to upstream/main)

Apologies for the noise. This PR (tiann#692) is scoped to the pluggable voice
backend only.

via [HAPI](https://hapi.run)

Co-Authored-By: HAPI <noreply@hapi.run>

Author: heavygee

hub/src/sync/syncEngine.ts

@@ -364,7 +364,6 @@ export class SyncEngine {
     ): Promise<void> {
         await this.messageService.sendMessage(sessionId, payload)
         this.sessionCache.markMessageQueued(sessionId)
-        this.sessionCache.recordSessionActivity(sessionId, Date.now())
     }
 
     async cancelQueuedMessage(

web/src/App.tsx

@@ -19,7 +19,6 @@ import { useAppGoBack } from '@/hooks/useAppGoBack'
 import { useTranslation } from '@/lib/use-translation'
 import { VoiceProvider } from '@/lib/voice-context'
 import { requireHubUrlForLogin } from '@/lib/runtime-config'
-import { getAppGlobalSseSubscription, getAppSessionSseSubscription } from '@/lib/appSseSubscriptions'
 import { LoginPrompt } from '@/components/LoginPrompt'
 import { InstallPrompt } from '@/components/InstallPrompt'
 import { OfflineBanner } from '@/components/OfflineBanner'
@@ -296,44 +295,28 @@ function AppInner() {
         })
     }, [addToast, translateIncomingToast])
 
-    const globalEventSubscription = useMemo(() => getAppGlobalSseSubscription(), [])
-    const sessionEventSubscription = useMemo(
-        () => getAppSessionSseSubscription(selectedSessionId),
-        [selectedSessionId]
-    )
-    const sseEnabled = Boolean(api && token)
+    const eventSubscription = useMemo(() => {
+        if (selectedSessionId) {
+            return { sessionId: selectedSessionId }
+        }
+        return { all: true }
+    }, [selectedSessionId])
 
-    const { subscriptionId: globalSubscriptionId } = useSSE({
-        enabled: sseEnabled,
+    const { subscriptionId } = useSSE({
+        enabled: Boolean(api && token),
         token: token ?? '',
         baseUrl,
-        subscription: globalEventSubscription,
-        scope: 'global',
+        subscription: eventSubscription,
         onConnect: handleSseConnect,
         onDisconnect: handleSseDisconnect,
-        onEvent: () => {},
+        onEvent: handleSseEvent,
         onToast: handleToast
     })
 
-    const { subscriptionId: sessionSubscriptionId } = useSSE({
-        enabled: sseEnabled && Boolean(sessionEventSubscription),
-        token: token ?? '',
-        baseUrl,
-        subscription: sessionEventSubscription ?? undefined,
-        scope: 'full',
-        onEvent: handleSseEvent
-    })
-
-    useVisibilityReporter({
-        api,
-        subscriptionId: globalSubscriptionId,
-        enabled: sseEnabled && !sessionEventSubscription
-    })
-
     useVisibilityReporter({
         api,
-        subscriptionId: sessionSubscriptionId,
-        enabled: sseEnabled && Boolean(sessionEventSubscription)
+        subscriptionId,
+        enabled: Boolean(api && token)
     })
 
     // Loading auth source

web/src/hooks/useSSE.test.ts

@@ -21,18 +21,6 @@ type SSESubscription = {
     machineId?: string
 }
 
-export type SSEScope = 'global' | 'full'
-
-const MESSAGE_STREAM_EVENT_TYPES = new Set<SyncEvent['type']>([
-    'message-received',
-    'messages-consumed',
-    'message-cancelled'
-])
-
-export function isGlobalScopedMessageStreamEvent(scope: SSEScope, eventType: SyncEvent['type']): boolean {
-    return scope === 'global' && MESSAGE_STREAM_EVENT_TYPES.has(eventType)
-}
-
 type VisibilityState = 'visible' | 'hidden'
 
 type ToastEvent = Extract<SyncEvent, { type: 'toast' }>
@@ -117,7 +105,6 @@ export function useSSE(options: {
     token: string
     baseUrl: string
     subscription?: SSESubscription
-    scope?: SSEScope
     onEvent: (event: SyncEvent) => void
     onConnect?: () => void
     onDisconnect?: (reason: string) => void
@@ -164,11 +151,10 @@ export function useSSE(options: {
     }, [options.onToast])
 
     const subscription = options.subscription ?? {}
-    const scope = options.scope ?? 'full'
 
     const subscriptionKey = useMemo(() => {
-        return `${scope}|${subscription.all ? '1' : '0'}|${subscription.sessionId ?? ''}|${subscription.machineId ?? ''}`
-    }, [scope, subscription.all, subscription.sessionId, subscription.machineId])
+        return `${subscription.all ? '1' : '0'}|${subscription.sessionId ?? ''}|${subscription.machineId ?? ''}`
+    }, [subscription.all, subscription.sessionId, subscription.machineId])
 
     useEffect(() => {
         if (!options.enabled) {
@@ -439,14 +425,6 @@ export function useSSE(options: {
                 return
             }
 
-            if (scope === 'global' && MESSAGE_STREAM_EVENT_TYPES.has(event.type)) {
-                if (event.type === 'message-received') {
-                    queueSessionListInvalidation()
-                }
-                onEventRef.current(event)
-                return
-            }
-
             if (event.type === 'messages-consumed') {
                 markMessagesConsumed(event.sessionId, event.localIds, event.invokedAt)
             }
@@ -597,7 +575,7 @@ export function useSSE(options: {
             }
             setSubscriptionId(null)
         }
-    }, [options.baseUrl, options.enabled, options.scope, options.token, scope, subscriptionKey, queryClient, reconnectNonce])
+    }, [options.baseUrl, options.enabled, options.token, subscriptionKey, queryClient, reconnectNonce])
 
     return { subscriptionId }
 }