@openchambery/web 1.19.5-beta.7 → 1.19.5-beta.9

package/server/lib/notifications/push-runtime.js

@@ -221,8 +221,7 @@ export const createPushRuntime = (deps) => {
     }
   };
 
-  const sendPushToAllUiSessions = async (payload, options = {}) => {
-    const requireNoSse = options.requireNoSse === true;
+  const sendPushToAllUiSessions = async (payload) => {
     const store = await readPushSubscriptionsFromDisk();
     const sessions = store.subscriptionsBySession || {};
     const subscriptionsByEndpoint = new Map();
@@ -239,14 +238,6 @@ export const createPushRuntime = (deps) => {
     }
 
     await Promise.all(Array.from(subscriptionsByEndpoint.values()).map(async (sub) => {
-      if (requireNoSse) {
-        // Mobile PWA subscriptions follow the same presence model as native push: suppress only
-        // when an interactive (desktop/web) client is visible. The phone PWA's own foreground is
-        // handled in the service worker (focused-client check), so it won't double-notify.
-        // Non-mobile (desktop/web) subscriptions keep the existing any-visible gate.
-        const suppressed = isMobilePlatform(sub.platform) ? isAnyInteractiveClientVisible() : isAnyUiVisible();
-        if (suppressed) return;
-      }
       await sendPushToSubscription(sub, payload);
     }));
   };
@@ -278,10 +269,9 @@ export const createPushRuntime = (deps) => {
     return false;
   };
 
-  // True when at least one NON-mobile client (desktop/web/vscode) is currently visible. Used to
-  // suppress native push to the phone: an active desktop already shows the notification, so the
-  // phone doesn't need it. Deliberately based on the desktop's visibility (reliable), never the
-  // phone's own (a backgrounded WKWebView can't report "hidden" before iOS suspends it).
+  // True when at least one NON-mobile client (desktop/web/vscode) is currently visible.
+  // Not a push gate — delivery always fans out. Kept as a visibility query for tests and
+  // diagnostics. Deliberately based on the desktop's visibility, never the phone's own.
   const isAnyInteractiveClientVisible = () => {
     const now = Date.now();
     pruneUiVisibility(now);

package/server/lib/notifications/runtime.js

@@ -12,7 +12,6 @@ export const createNotificationTriggerRuntime = (deps) => {
     sendPushToAllUiSessions,
     sendApnsToAllUiSessions,
     sendLiveActivityEnd,
-    isAnyInteractiveClientVisible,
     buildOpenCodeUrl,
     getOpenCodeAuthHeaders,
   } = deps;
@@ -68,25 +67,17 @@ export const createNotificationTriggerRuntime = (deps) => {
   };
 
   // Fan a notification out to every delivery channel: browser web-push (full templated
-  // payload) and native iOS APNs (generic model-based text). Both share the dedup tag and
-  // `requireNoSse` focus gate; a failure in one channel must not block the other.
-  const fanoutPush = (payload, options) => {
-    // Presence-aware routing: if any interactive (non-mobile) client — desktop/web/vscode — is
-    // currently visible, it already shows the in-app notification, so skip the native push to the
-    // phone. Gated on the desktop's visibility (reliable), never the phone's own. When we skip we
-    // also skip toApnsGenericPayload, so the badge isn't incremented for an undelivered push.
-    const interactiveVisible = isAnyInteractiveClientVisible?.() === true;
-    return Promise.all([
-      Promise.resolve(sendPushToAllUiSessions?.(payload, options)).catch((error) => {
-        console.warn('[Push] web-push fanout failed:', error?.message ?? error);
-      }),
-      interactiveVisible
-        ? Promise.resolve()
-        : Promise.resolve(sendApnsToAllUiSessions?.(toApnsGenericPayload(payload), options)).catch((error) => {
-            console.warn('[APNs] fanout failed:', error?.message ?? error);
-          }),
-    ]);
-  };
+  // payload) and native iOS APNs (generic model-based text). Both share the dedup tag;
+  // a failure in one channel must not block the other. Visibility on any other client
+  // never suppresses delivery — every subscribed surface gets the push.
+  const fanoutPush = (payload, options) => Promise.all([
+    Promise.resolve(sendPushToAllUiSessions?.(payload, options)).catch((error) => {
+      console.warn('[Push] web-push fanout failed:', error?.message ?? error);
+    }),
+    Promise.resolve(sendApnsToAllUiSessions?.(toApnsGenericPayload(payload), options)).catch((error) => {
+      console.warn('[APNs] fanout failed:', error?.message ?? error);
+    }),
+  ]);
 
   let getIsWindowFocused = typeof deps.getIsWindowFocused === 'function'
     ? deps.getIsWindowFocused

package/server/lib/notifications/runtime.test.js

@@ -28,7 +28,6 @@ const createRuntime = (overrides = {}) => {
     sendPushToAllUiSessions,
     sendApnsToAllUiSessions,
     sendLiveActivityEnd,
-    isAnyInteractiveClientVisible: () => false,
     buildOpenCodeUrl: (path) => `http://opencode.test${path}`,
     getOpenCodeAuthHeaders: () => ({}),
     getIsWindowFocused: () => false,
@@ -224,14 +223,13 @@ describe('notification trigger live activity end', () => {
     expect(sendApnsToAllUiSessions).not.toHaveBeenCalled();
   });
 
-  it('ends the live activity even when an interactive client is visible', async () => {
+  it('still sends native push when another client is visible', async () => {
     vi.stubGlobal('fetch', vi.fn(async () => rootSessionResponse()));
-    const { runtime, sendLiveActivityEnd, sendApnsToAllUiSessions } = createRuntime({
-      isAnyInteractiveClientVisible: () => true,
-    });
+    const { runtime, sendLiveActivityEnd, sendApnsToAllUiSessions, sendPushToAllUiSessions } = createRuntime();
     await runtime.maybeSendPushForTrigger(completionPayload());
     expect(sendLiveActivityEnd).toHaveBeenCalledWith({ sessionId: 'ses_root', status: 'complete' });
-    expect(sendApnsToAllUiSessions).not.toHaveBeenCalled();
+    expect(sendPushToAllUiSessions).toHaveBeenCalledTimes(1);
+    expect(sendApnsToAllUiSessions).toHaveBeenCalledTimes(1);
   });
 
   it('suppresses live activity end for child and small-model sessions', async () => {