npm - @openchambery/web - Versions diffs - 1.19.7-beta.5 → 1.19.7-beta.7 - Mend

@openchambery/web 1.19.7-beta.5 → 1.19.7-beta.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (74) hide show

package/dist/index.html CHANGED Viewed

@@ -552,26 +552,26 @@
         opacity: 0.72;
       }
     </style>
-    <script type="module" crossorigin src="/assets/main-BtZPyHBH.js"></script>
+    <script type="module" crossorigin src="/assets/main-Blsi9j8P.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/runtime-switch-BkpTTbEi.js">
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-C0FnF6B9.js">
     <link rel="modulepreload" crossorigin href="/assets/desktop-CfLlmafK.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-base-ui-CnHfUmDN.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-zustand-B4dlGEM2.js">
-    <link rel="modulepreload" crossorigin href="/assets/useUIStore-B7KJS5G7.js">
+    <link rel="modulepreload" crossorigin href="/assets/useUIStore-CNLmCoPU.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-pathe-vBmvQE8f.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-DLPElpoQ.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-tanstack-query-core-BWz0ose6.js">
-    <link rel="modulepreload" crossorigin href="/assets/persistence-CmjKImz2.js">
+    <link rel="modulepreload" crossorigin href="/assets/persistence-w-AiX2i4.js">
     <link rel="modulepreload" crossorigin href="/assets/desktopHosts-C1Ns3DUu.js">
-    <link rel="modulepreload" crossorigin href="/assets/desktopRelayRestore-LBt0CBOj.js">
+    <link rel="modulepreload" crossorigin href="/assets/desktopRelayRestore-8pvI_dSc.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-opencode-sdk-C07HQypa.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-aparajita-capacitor-secure-storage-CjQdwfjS.js">
-    <link rel="modulepreload" crossorigin href="/assets/platform-skqcMARt.js">
-    <link rel="modulepreload" crossorigin href="/assets/terminalApi-CNqqwjfG.js">
+    <link rel="modulepreload" crossorigin href="/assets/platform-4eCmsdol.js">
+    <link rel="modulepreload" crossorigin href="/assets/terminalApi-CGtOtc8I.js">
     <link rel="modulepreload" crossorigin href="/assets/types-BuiqMmh_.js">
     <link rel="modulepreload" crossorigin href="/assets/capgoAdapter-DCowZ2ab.js">
-    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-Fsa7BZKx.js">
+    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-ClsErHd9.js">
     <link rel="stylesheet" crossorigin href="/assets/src-DZt1nWf5.css">
   </head>
   <body class="h-full bg-background text-foreground">

package/dist/mini-chat.html CHANGED Viewed

@@ -74,26 +74,26 @@
       }
     </style>
-    <script type="module" crossorigin src="/assets/miniChat-Dqm16yyZ.js"></script>
+    <script type="module" crossorigin src="/assets/miniChat-QgI11lL4.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/runtime-switch-BkpTTbEi.js">
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-C0FnF6B9.js">
     <link rel="modulepreload" crossorigin href="/assets/desktop-CfLlmafK.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-base-ui-CnHfUmDN.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-zustand-B4dlGEM2.js">
-    <link rel="modulepreload" crossorigin href="/assets/useUIStore-B7KJS5G7.js">
+    <link rel="modulepreload" crossorigin href="/assets/useUIStore-CNLmCoPU.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-pathe-vBmvQE8f.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-DLPElpoQ.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-tanstack-query-core-BWz0ose6.js">
-    <link rel="modulepreload" crossorigin href="/assets/persistence-CmjKImz2.js">
+    <link rel="modulepreload" crossorigin href="/assets/persistence-w-AiX2i4.js">
     <link rel="modulepreload" crossorigin href="/assets/desktopHosts-C1Ns3DUu.js">
-    <link rel="modulepreload" crossorigin href="/assets/desktopRelayRestore-LBt0CBOj.js">
+    <link rel="modulepreload" crossorigin href="/assets/desktopRelayRestore-8pvI_dSc.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-opencode-sdk-C07HQypa.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-aparajita-capacitor-secure-storage-CjQdwfjS.js">
-    <link rel="modulepreload" crossorigin href="/assets/platform-skqcMARt.js">
-    <link rel="modulepreload" crossorigin href="/assets/terminalApi-CNqqwjfG.js">
+    <link rel="modulepreload" crossorigin href="/assets/platform-4eCmsdol.js">
+    <link rel="modulepreload" crossorigin href="/assets/terminalApi-CGtOtc8I.js">
     <link rel="modulepreload" crossorigin href="/assets/types-BuiqMmh_.js">
     <link rel="modulepreload" crossorigin href="/assets/capgoAdapter-DCowZ2ab.js">
-    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-Fsa7BZKx.js">
+    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-ClsErHd9.js">
     <link rel="stylesheet" crossorigin href="/assets/src-DZt1nWf5.css">
   </head>
   <body class="h-full bg-background text-foreground">

package/dist/mobile.html CHANGED Viewed

@@ -63,26 +63,26 @@
       })();
     </script>
-    <script type="module" crossorigin src="/assets/mobile-CzSQKW-r.js"></script>
+    <script type="module" crossorigin src="/assets/mobile-BjMMtvjD.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/runtime-switch-BkpTTbEi.js">
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-C0FnF6B9.js">
     <link rel="modulepreload" crossorigin href="/assets/desktop-CfLlmafK.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-base-ui-CnHfUmDN.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-zustand-B4dlGEM2.js">
-    <link rel="modulepreload" crossorigin href="/assets/useUIStore-B7KJS5G7.js">
+    <link rel="modulepreload" crossorigin href="/assets/useUIStore-CNLmCoPU.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-pathe-vBmvQE8f.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-DLPElpoQ.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-tanstack-query-core-BWz0ose6.js">
-    <link rel="modulepreload" crossorigin href="/assets/persistence-CmjKImz2.js">
+    <link rel="modulepreload" crossorigin href="/assets/persistence-w-AiX2i4.js">
     <link rel="modulepreload" crossorigin href="/assets/desktopHosts-C1Ns3DUu.js">
-    <link rel="modulepreload" crossorigin href="/assets/desktopRelayRestore-LBt0CBOj.js">
+    <link rel="modulepreload" crossorigin href="/assets/desktopRelayRestore-8pvI_dSc.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-opencode-sdk-C07HQypa.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-aparajita-capacitor-secure-storage-CjQdwfjS.js">
-    <link rel="modulepreload" crossorigin href="/assets/platform-skqcMARt.js">
-    <link rel="modulepreload" crossorigin href="/assets/terminalApi-CNqqwjfG.js">
+    <link rel="modulepreload" crossorigin href="/assets/platform-4eCmsdol.js">
+    <link rel="modulepreload" crossorigin href="/assets/terminalApi-CGtOtc8I.js">
     <link rel="modulepreload" crossorigin href="/assets/types-BuiqMmh_.js">
     <link rel="modulepreload" crossorigin href="/assets/capgoAdapter-DCowZ2ab.js">
-    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-Fsa7BZKx.js">
+    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-ClsErHd9.js">
     <link rel="stylesheet" crossorigin href="/assets/src-DZt1nWf5.css">
   </head>
   <body class="h-full bg-background text-foreground">

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@openchambery/web",
-  "version": "1.19.7-beta.5",
+  "version": "1.19.7-beta.7",
   "private": false,
   "type": "module",
   "main": "./server/index.js",

package/server/lib/notifications/APNS.md CHANGED Viewed

@@ -116,8 +116,8 @@ is server-global, so every device token of a server sees the same badge.
 Host (`apns-runtime.js`):
 - `OPENCHAMBER_PUSH_RELAY_URL` (explicit send-URL override), `OPENCHAMBER_APNS_ENVIRONMENT`
-  (`sandbox` default / `production` for TestFlight and App Store). The signing keypair is
-  auto-generated — nothing to set.
+  (`production` default for TestFlight/App Store builds; set `sandbox` for Xcode development
+  builds). The signing keypair is auto-generated — nothing to set.
 - Direct fallback: `OPENCHAMBER_APNS_KEY_ID`, `OPENCHAMBER_APNS_TEAM_ID`, `OPENCHAMBER_APNS_P8`
   (or `_P8_PATH`), `OPENCHAMBER_APNS_BUNDLE_ID`, `OPENCHAMBER_PUSH_RELAY_DISABLED=true`.
@@ -136,8 +136,8 @@ device tokens, or signatures.
 2. Give those values only to the Push process (environment or Docker secret). Do not put the
    `.p8` on Layer 1 or on each OpenChamber Host when using Relay mode.
 3. Xcode: confirm the Push Notifications capability; Clean Build Folder; run on device.
-   Development builds use APNs `sandbox`. TestFlight and App Store Hosts set
-   `OPENCHAMBER_APNS_ENVIRONMENT=production`.
+   Hosts default to APNs `production` (TestFlight/App Store tokens). Xcode development
+   builds (sandbox tokens) need `OPENCHAMBER_APNS_ENVIRONMENT=sandbox`.
 ## Security posture

package/server/lib/notifications/DOCUMENTATION.md CHANGED Viewed

@@ -79,7 +79,7 @@ This module provides notification message preparation utilities for the web serv
   - `sendApnsToAllUiSessions(payload)` — localizes scenario titles per stored token locale (`apns-titles.js`), groups tokens by locale, then signs + sends (no UI-visibility gate; iOS suppresses the foreground banner). Before a relay send, each token is checked against the in-memory registration success cache for the current register URL; cache hits skip `/v1/push/register-token`, misses are registered with bounded concurrency, and only successfully bound tokens are sent. Switching Relay/Push URL clears that cache so the next send re-binds persisted tokens to the new origin. No-ops with a single warning when APNs is unconfigured. Drops tokens on `410` / `BadDeviceToken` / `Unregistered`. Never sends Live Activity tokens.
   - `reRegisterAllTokens()` — binds every persisted device token to the current Push origin (same success cache and URL-switch invalidation as send).
   - `resolveApnsConfig()`
-- Configuration (env first, then `settings.apnsConfig`): `OPENCHAMBER_PUSH_RELAY_URL` (optional send-URL override), `OPENCHAMBER_PUSH_RELAY_DISABLED`, `OPENCHAMBER_APNS_KEY_ID`, `OPENCHAMBER_APNS_TEAM_ID`, `OPENCHAMBER_APNS_P8` (PEM contents; literal `\n` accepted) or `OPENCHAMBER_APNS_P8_PATH`, `OPENCHAMBER_APNS_BUNDLE_ID` (default `com.yee94.openchamber`), `OPENCHAMBER_APNS_ENVIRONMENT` (`sandbox` default, or `production` for TestFlight and App Store).
+- Configuration (env first, then `settings.apnsConfig`): `OPENCHAMBER_PUSH_RELAY_URL` (optional send-URL override), `OPENCHAMBER_PUSH_RELAY_DISABLED`, `OPENCHAMBER_APNS_KEY_ID`, `OPENCHAMBER_APNS_TEAM_ID`, `OPENCHAMBER_APNS_P8` (PEM contents; literal `\n` accepted) or `OPENCHAMBER_APNS_P8_PATH`, `OPENCHAMBER_APNS_BUNDLE_ID` (default `com.yee94.openchamber`), `OPENCHAMBER_APNS_ENVIRONMENT` (`production` default for TestFlight/App Store builds; set `sandbox` explicitly for Xcode development builds).
 ### Emitter runtime API (emitter-runtime.js)
 - `createNotificationEmitterRuntime(dependencies)`: creates runtime for unified notification emission channels.

package/server/lib/notifications/apns-runtime.js CHANGED Viewed

@@ -36,6 +36,72 @@ const LIVE_ACTIVITY_TOKEN_TTL_MS = 24 * 60 * 60 * 1000;
 const LIVE_ACTIVITY_COMPLETE_DISMISSAL_SECONDS = 15 * 60;
 const LIVE_ACTIVITY_ERROR_DISMISSAL_SECONDS = 60 * 60;
 const LIVE_ACTIVITY_STALE_SECONDS = 20 * 60;
+const LIVE_ACTIVITY_AGGREGATE_SESSION_ID = 'live';
+const MAX_LIVE_ACTIVITY_SNAPSHOT_ITEMS = 4;
+const LIVE_ACTIVITY_ITEM_STATUSES = new Set([
+  'working', 'tool', 'retry', 'input', 'permission', 'stale', 'complete', 'error',
+]);
+const parseLiveActivitySnapshot = (value) => {
+  if (!Array.isArray(value)) return undefined;
+  const items = [];
+  for (const raw of value.slice(0, MAX_LIVE_ACTIVITY_SNAPSHOT_ITEMS)) {
+    if (!raw || typeof raw !== 'object') continue;
+    const sessionId = typeof raw.sessionId === 'string'
+      ? raw.sessionId.trim()
+      : (typeof raw.sessionID === 'string' ? raw.sessionID.trim() : '');
+    if (!sessionId || sessionId.length > MAX_LIVE_ACTIVITY_ID_CHARS) continue;
+    const status = typeof raw.status === 'string' && LIVE_ACTIVITY_ITEM_STATUSES.has(raw.status)
+      ? raw.status
+      : 'working';
+    const startedAt = Number(raw.startedAt);
+    if (!Number.isFinite(startedAt)) continue;
+    const item = {
+      sessionId,
+      title: typeof raw.title === 'string' ? raw.title.slice(0, 80) : '',
+      status,
+      startedAt,
+    };
+    const endedAt = Number(raw.endedAt);
+    if (Number.isFinite(endedAt)) item.endedAt = endedAt;
+    items.push(item);
+  }
+  return items;
+};
+const liveActivityItemIsWorking = (status) => status !== 'complete' && status !== 'error';
+const liveActivityEntryCoversSession = (entry, sessionId) => {
+  if (entry.sessionId === sessionId) return true;
+  if (Array.isArray(entry.snapshot) && entry.snapshot.length > 0) {
+    return entry.snapshot.some((item) => item.sessionId === sessionId);
+  }
+  return entry.sessionId === LIVE_ACTIVITY_AGGREGATE_SESSION_ID;
+};
+const contentStateFromSnapshot = (snapshot, status, eventVersion, updatedAt, endedAt) => {
+  const working = snapshot.filter((item) => liveActivityItemIsWorking(item.status));
+  const primary = working[0] ?? snapshot[0];
+  const contentState = {
+    status,
+    eventVersion,
+    updatedAt,
+    workingCount: working.length,
+    items: snapshot.map((item) => {
+      const next = {
+        sessionID: item.sessionId,
+        title: item.title,
+        status: item.status,
+        startedAt: item.startedAt,
+      };
+      if (item.endedAt !== undefined) next.endedAt = item.endedAt;
+      return next;
+    }),
+  };
+  if (primary?.title) contentState.title = primary.title;
+  if (endedAt !== undefined) contentState.endedAt = endedAt;
+  return contentState;
+};
 const MAX_RELAY_SEND_TOKENS = 100;
 const RELAY_REGISTER_CONCURRENCY = 16;
 const APNS_COLLAPSE_ID_MAX_BYTES = 64;
@@ -356,7 +422,8 @@ export const createApnsRuntime = (deps) => {
         const createdAt = typeof entry.createdAt === 'number' ? entry.createdAt : null;
         const lastSeenAt = typeof entry.lastSeenAt === 'number' ? entry.lastSeenAt : createdAt;
         if (typeof lastSeenAt === 'number' && now - lastSeenAt > LIVE_ACTIVITY_TOKEN_TTL_MS) return null;
-        return { token, activityId, sessionId, createdAt, lastSeenAt };
+        const snapshot = parseLiveActivitySnapshot(entry.snapshot);
+        return { token, activityId, sessionId, snapshot, createdAt, lastSeenAt };
       })
       .filter(Boolean);
   };
@@ -464,7 +531,7 @@ export const createApnsRuntime = (deps) => {
     });
   };
-  const addOrUpdateLiveActivityToken = async (uiSessionToken, token, activityId, sessionId) => {
+  const addOrUpdateLiveActivityToken = async (uiSessionToken, token, activityId, sessionId, snapshot) => {
     if (!uiSessionToken) return;
     const trimmedToken = typeof token === 'string' ? token.trim() : '';
     const trimmedActivityId = typeof activityId === 'string' ? activityId.trim() : '';
@@ -486,10 +553,12 @@ export const createApnsRuntime = (deps) => {
       const filtered = existing.filter(
         (entry) => entry.activityId !== trimmedActivityId && entry.token !== trimmedToken,
       );
+      const nextSnapshot = parseLiveActivitySnapshot(snapshot) ?? replaced?.snapshot;
       filtered.unshift({
         token: trimmedToken,
         activityId: trimmedActivityId,
         sessionId: trimmedSessionId,
+        snapshot: nextSnapshot,
         createdAt: typeof replaced?.createdAt === 'number' ? replaced.createdAt : now,
         lastSeenAt: now,
       });
@@ -590,7 +659,7 @@ export const createApnsRuntime = (deps) => {
       teamId,
       p8,
       bundleId: bundleId || DEFAULT_BUNDLE_ID,
-      environment: environment === 'production' ? 'production' : 'sandbox',
+      environment: (environment || 'production') === 'production' ? 'production' : 'sandbox',
     };
   };
@@ -710,7 +779,7 @@ export const createApnsRuntime = (deps) => {
     liveActivityUnregisterUrl: url.replace(/\/send$/, '/unregister-live-activity-token'),
     liveActivitySendUrl: url.replace(/\/send$/, '/live-activity'),
     environment:
-      (trimmedEnv('OPENCHAMBER_APNS_ENVIRONMENT') || 'sandbox').toLowerCase() === 'production'
+      (trimmedEnv('OPENCHAMBER_APNS_ENVIRONMENT') || 'production').toLowerCase() === 'production'
         ? 'production'
         : 'sandbox',
   });
@@ -857,9 +926,13 @@ export const createApnsRuntime = (deps) => {
     return { dismissalDate: liveActivityDismissalDate(status, nowMs) };
   };
-  const liveActivityRelaySignMessage = ({ ts, tokens, event, contentState, dismissalDate, staleDate }) => (
-    `${ts}.${[...tokens].sort().join(',')}.${event}.${contentState.status}.${contentState.eventVersion}.${contentState.updatedAt}.${contentState.endedAt ?? ''}.${dismissalDate ?? ''}.${staleDate ?? ''}`
-  );
+  const liveActivityRelaySignMessage = ({ ts, tokens, event, contentState, dismissalDate, staleDate }) => {
+    let message = `${ts}.${[...tokens].sort().join(',')}.${event}.${contentState.status}.${contentState.eventVersion}.${contentState.updatedAt}.${contentState.endedAt ?? ''}.${dismissalDate ?? ''}.${staleDate ?? ''}`;
+    if (contentState.title !== undefined || contentState.workingCount !== undefined || contentState.items !== undefined) {
+      message += `.${contentState.title ?? ''}.${contentState.workingCount ?? ''}.${JSON.stringify(contentState.items ?? [])}`;
+    }
+    return message;
+  };
   const sendLiveActivityViaRelay = async (deviceTokens, payload, relay) => {
     if (!Array.isArray(deviceTokens) || deviceTokens.length === 0) return [];
@@ -1039,7 +1112,7 @@ export const createApnsRuntime = (deps) => {
     const seen = new Set();
     for (const record of Object.values(pruneLiveActivityTokensBySession(store.liveActivityTokensBySession, now))) {
       for (const entry of record) {
-        if (entry.sessionId !== sessionId || seen.has(entry.token)) continue;
+        if (!liveActivityEntryCoversSession(entry, sessionId) || seen.has(entry.token)) continue;
         seen.add(entry.token);
         entries.push(entry);
       }
@@ -1047,14 +1120,18 @@ export const createApnsRuntime = (deps) => {
     return entries;
   };
-  const sendLiveActivityEnd = async ({ sessionId, status, eventVersion, endedAt } = {}) => {
+  const sendLiveActivityEnd = async ({ sessionId, status, eventVersion, endedAt, title } = {}) => {
     const trimmedSessionId = typeof sessionId === 'string' ? sessionId.trim() : '';
     if (!isLimitedId(trimmedSessionId, MAX_LIVE_ACTIVITY_ID_CHARS)) return;
-    if (!LIVE_ACTIVITY_TERMINAL_STATUSES.has(status)) return;
+    const nextStatus = LIVE_ACTIVITY_TERMINAL_STATUSES.has(status) ? status : undefined;
+    const nextTitle = typeof title === 'string' ? title.trim().slice(0, 80) : '';
+    if (!nextStatus && !nextTitle) return;
     const now = Date.now();
     let pendingEntries = [];
     let nextVersion = 0;
+    let event = 'end';
+    let snapshotForSend;
     await persistTokenUpdate((current) => {
       const liveActivityTokensBySession = pruneLiveActivityTokensBySession(
         current.liveActivityTokensBySession,
@@ -1068,31 +1145,73 @@ export const createApnsRuntime = (deps) => {
       if (pendingEntries.length === 0) {
         return { ...current, liveActivityTokensBySession };
       }
-      const previous = current.liveActivityEventVersions?.[trimmedSessionId];
+      const previous = current.liveActivityEventVersions?.[trimmedSessionId]
+        ?? current.liveActivityEventVersions?.[LIVE_ACTIVITY_AGGREGATE_SESSION_ID];
       nextVersion = nextLiveActivityEventVersion(now, previous, eventVersion);
+      const endedAtSeconds = toLiveActivityUnixSeconds(endedAt, now);
+      for (const [uiSession, record] of Object.entries(liveActivityTokensBySession)) {
+        liveActivityTokensBySession[uiSession] = record.map((entry) => {
+          if (!liveActivityEntryCoversSession(entry, trimmedSessionId)) return entry;
+          if (!Array.isArray(entry.snapshot) || entry.snapshot.length === 0) return entry;
+          const snapshot = entry.snapshot.map((item) => {
+            if (item.sessionId !== trimmedSessionId) return item;
+            const patched = { ...item };
+            if (nextTitle) patched.title = nextTitle;
+            if (nextStatus) {
+              patched.status = nextStatus;
+              patched.endedAt = endedAtSeconds;
+            }
+            return patched;
+          });
+          snapshotForSend = snapshot;
+          return { ...entry, snapshot };
+        });
+      }
+      const working = Array.isArray(snapshotForSend)
+        ? snapshotForSend.filter((item) => liveActivityItemIsWorking(item.status))
+        : [];
+      event = nextStatus && working.length === 0 ? 'end' : 'update';
+      if (!nextStatus) event = 'update';
       return {
         ...current,
         liveActivityTokensBySession,
         liveActivityEventVersions: {
           ...(current.liveActivityEventVersions || {}),
           [trimmedSessionId]: nextVersion,
+          [LIVE_ACTIVITY_AGGREGATE_SESSION_ID]: nextVersion,
         },
       };
     });
     if (pendingEntries.length === 0) return;
+    if (!nextStatus && !(Array.isArray(snapshotForSend) && snapshotForSend.length > 0)) return;
     const updatedAt = now / 1000;
     const endedAtSeconds = toLiveActivityUnixSeconds(endedAt, now);
-    const contentState = {
-      status,
-      eventVersion: nextVersion,
-      updatedAt,
-      endedAt: endedAtSeconds,
-    };
+    const aggregateStatus = event === 'end'
+      ? (nextStatus || 'complete')
+      : (Array.isArray(snapshotForSend)
+        ? (snapshotForSend.some((item) => liveActivityItemIsWorking(item.status))
+          ? (snapshotForSend.find((item) => liveActivityItemIsWorking(item.status))?.status || 'working')
+          : (nextStatus || 'working'))
+        : (nextStatus || 'working'));
+    const contentState = Array.isArray(snapshotForSend) && snapshotForSend.length > 0
+      ? contentStateFromSnapshot(
+        snapshotForSend,
+        aggregateStatus,
+        nextVersion,
+        updatedAt,
+        event === 'end' ? endedAtSeconds : undefined,
+      )
+      : {
+        status: nextStatus || 'complete',
+        eventVersion: nextVersion,
+        updatedAt,
+        ...(event === 'end' ? { endedAt: endedAtSeconds } : {}),
+      };
     const payload = {
-      event: 'end',
+      event,
       contentState,
-      ...liveActivityPushDates('end', status, updatedAt, now),
+      ...liveActivityPushDates(event, contentState.status, updatedAt, now),
     };
     const tokens = pendingEntries.map((entry) => entry.token);
@@ -1121,7 +1240,7 @@ export const createApnsRuntime = (deps) => {
       return;
     }
-    if (accepted.length > 0) {
+    if (event === 'end' && accepted.length > 0) {
       await removeLiveActivityTokens(accepted);
     }
   };

package/server/lib/notifications/apns-runtime.test.js CHANGED Viewed

@@ -115,6 +115,25 @@ describe('apns runtime bundle ID', () => {
   });
 });
+describe('apns runtime APNs environment', () => {
+  it('defaults resolveApnsConfig environment to production when env and settings omit it', async () => {
+    process.env.OPENCHAMBER_APNS_KEY_ID = 'KEY123';
+    process.env.OPENCHAMBER_APNS_TEAM_ID = 'TEAM123';
+    process.env.OPENCHAMBER_APNS_P8 = P8;
+    const runtime = createApnsRuntime(makeDeps());
+    await expect(runtime.resolveApnsConfig()).resolves.toMatchObject({ environment: 'production' });
+  });
+  it('uses sandbox when OPENCHAMBER_APNS_ENVIRONMENT=sandbox', async () => {
+    process.env.OPENCHAMBER_APNS_KEY_ID = 'KEY123';
+    process.env.OPENCHAMBER_APNS_TEAM_ID = 'TEAM123';
+    process.env.OPENCHAMBER_APNS_P8 = P8;
+    process.env.OPENCHAMBER_APNS_ENVIRONMENT = 'sandbox';
+    const runtime = createApnsRuntime(makeDeps());
+    await expect(runtime.resolveApnsConfig()).resolves.toMatchObject({ environment: 'sandbox' });
+  });
+});
 describe('apns runtime relay mode (default)', () => {
   it('registers tokens (signed) and posts signed generic text, dropping dead tokens', async () => {
     const fetchMock = vi.fn(async (url) =>
@@ -618,9 +637,9 @@ describe('apns runtime push relay derivation and re-register', () => {
     expect(sendBodies).toHaveLength(3);
     const byTitle = Object.fromEntries(sendBodies.map((body) => [body.title, body]));
-    expect(byTitle['Agent response is ready']?.tokens).toEqual(['tokenEn']);
-    expect(byTitle['智能体回复已就绪']?.tokens).toEqual(['tokenZh']);
-    expect(byTitle['エージェントの応答が準備できました']?.tokens).toEqual(['tokenJa']);
+    expect(byTitle['Task completed']?.tokens).toEqual(['tokenEn']);
+    expect(byTitle['任务已完成']?.tokens).toEqual(['tokenZh']);
+    expect(byTitle['タスク完了']?.tokens).toEqual(['tokenJa']);
     for (const body of sendBodies) {
       expect(body.body).toBe('My session');
       expect(body.badge).toBe(2);
@@ -641,7 +660,7 @@ describe('apns runtime push relay derivation and re-register', () => {
     await runtime.sendApnsToAllUiSessions({ type: 'permission', sessionName: 'S' });
     const sent = JSON.parse(fetchMock.mock.calls.find(isSend)[1].body);
-    expect(sent.title).toBe('Agent needs permission');
+    expect(sent.title).toBe('Needs permission');
     expect(sent.body).toBe('S');
   });
 });
@@ -840,7 +859,7 @@ describe('apns live activity routes', () => {
       body: { token: ' la-token ', activityId: ' act-1 ', sessionId: ' ses_1 ' },
     }, postRes);
     expect(postRes.body).toEqual({ ok: true });
-    expect(addOrUpdateLiveActivityToken).toHaveBeenCalledWith('ui-token', 'la-token', 'act-1', 'ses_1');
+    expect(addOrUpdateLiveActivityToken).toHaveBeenCalledWith('ui-token', 'la-token', 'act-1', 'ses_1', undefined);
     const delRes = createMockRes();
     await getRoute('DELETE', '/api/push/live-activity-token')({ body: { token: 'la-token' } }, delRes);
@@ -906,6 +925,34 @@ describe('apns live activity relay and direct delivery', () => {
     }
   });
+  it('updates the aggregate live activity when one covered session completes', async () => {
+    const fetchMock = vi.fn(async () => jsonResponse({ ok: true, results: [] }));
+    vi.stubGlobal('fetch', fetchMock);
+    process.env.OPENCHAMBER_PUSH_RELAY_URL = 'https://relay.test/v1/push/send';
+    const runtime = createApnsRuntime(makeDeps());
+    const token = 'a'.repeat(64);
+    await runtime.addOrUpdateLiveActivityToken('s1', token, 'act-1', 'live', [
+      { sessionId: 'ses_a', title: 'Alpha', status: 'working', startedAt: 100 },
+      { sessionId: 'ses_b', title: 'Beta', status: 'working', startedAt: 100 },
+    ]);
+    fetchMock.mockClear();
+    await runtime.sendLiveActivityEnd({ sessionId: 'ses_a', status: 'complete' });
+    const sent = JSON.parse(fetchMock.mock.calls.find(isLiveActivitySend)[1].body);
+    expect(sent.event).toBe('update');
+    expect(sent.contentState.workingCount).toBe(1);
+    expect(sent.contentState.items).toEqual([
+      expect.objectContaining({ sessionID: 'ses_a', status: 'complete', title: 'Alpha' }),
+      expect.objectContaining({ sessionID: 'ses_b', status: 'working', title: 'Beta' }),
+    ]);
+    expect(sent.staleDate).toBeTypeOf('number');
+    expect(sent.dismissalDate).toBeUndefined();
+    await verifyRelaySignature(
+      sent.publicKeyJwk,
+      `${sent.ts}.${[...sent.tokens].sort().join(',')}.${sent.event}.${sent.contentState.status}.${sent.contentState.eventVersion}.${sent.contentState.updatedAt}.${sent.contentState.endedAt ?? ''}.${sent.dismissalDate ?? ''}.${sent.staleDate ?? ''}.${sent.contentState.title ?? ''}.${sent.contentState.workingCount ?? ''}.${JSON.stringify(sent.contentState.items ?? [])}`,
+      sent.sig,
+    ).then((ok) => expect(ok).toBe(true));
+  });
   it('uses a 60-minute dismissal for error ends', async () => {
     const fetchMock = vi.fn(async () => jsonResponse({ ok: true, results: [] }));
     vi.stubGlobal('fetch', fetchMock);
@@ -921,11 +968,10 @@ describe('apns live activity relay and direct delivery', () => {
     expect(sent.dismissalDate).toBeLessThanOrEqual(Math.floor(after / 1000) + 60 * 60);
   });
-  it('forwards OPENCHAMBER_APNS_ENVIRONMENT=production as env on live-activity relay send', async () => {
+  it('defaults live-activity relay env to production when OPENCHAMBER_APNS_ENVIRONMENT is unset', async () => {
     const fetchMock = vi.fn(async () => jsonResponse({ ok: true, results: [] }));
     vi.stubGlobal('fetch', fetchMock);
     process.env.OPENCHAMBER_PUSH_RELAY_URL = 'https://relay.test/v1/push/send';
-    process.env.OPENCHAMBER_APNS_ENVIRONMENT = 'production';
     const runtime = createApnsRuntime(makeDeps());
     await runtime.addOrUpdateLiveActivityToken('s1', 'la-token', 'act-1', 'ses_1');
     fetchMock.mockClear();
@@ -934,6 +980,19 @@ describe('apns live activity relay and direct delivery', () => {
     expect(sent.env).toBe('production');
   });
+  it('forwards OPENCHAMBER_APNS_ENVIRONMENT=sandbox as env on live-activity relay send', async () => {
+    const fetchMock = vi.fn(async () => jsonResponse({ ok: true, results: [] }));
+    vi.stubGlobal('fetch', fetchMock);
+    process.env.OPENCHAMBER_PUSH_RELAY_URL = 'https://relay.test/v1/push/send';
+    process.env.OPENCHAMBER_APNS_ENVIRONMENT = 'sandbox';
+    const runtime = createApnsRuntime(makeDeps());
+    await runtime.addOrUpdateLiveActivityToken('s1', 'la-token', 'act-1', 'ses_1');
+    fetchMock.mockClear();
+    await runtime.sendLiveActivityEnd({ sessionId: 'ses_1', status: 'complete' });
+    const sent = JSON.parse(fetchMock.mock.calls.find(isLiveActivitySend)[1].body);
+    expect(sent.env).toBe('sandbox');
+  });
   it('keeps tokens after a failed relay end so a later attempt can retry', async () => {
     const fetchMock = vi.fn(async (url) => {
       if (String(url).endsWith('/live-activity')) return jsonResponse({ error: true }, 500);