@openchambery/web 1.19.12 → 1.19.13-beta.1

package/server/lib/llm/catalog.js

@@ -5,8 +5,19 @@ const stringID = (value) => (typeof value === 'string' && value.trim() ? value.t
 const listIncludesImage = (value) => Array.isArray(value)
   && value.some((item) => String(item).toLowerCase() === 'image');
 
-function modelAcceptsImages(model) {
+/**
+ * Vision capability projection.
+ * Prefer authoritative OpenCode SDK Model.capabilities (`input.image` / `attachment`),
+ * then fall back to legacy modalities/input/attachment shapes used by older fixtures.
+ */
+export function modelAcceptsImages(model) {
   if (!isRecord(model)) return false;
+  if (isRecord(model.capabilities)) {
+    if (isRecord(model.capabilities.input) && typeof model.capabilities.input.image === 'boolean') {
+      return model.capabilities.input.image === true;
+    }
+    if (model.capabilities.attachment === true) return true;
+  }
   if (isRecord(model.modalities) && listIncludesImage(model.modalities.input)) return true;
   if (listIncludesImage(model.input)) return true;
   return model.attachment === true;
@@ -40,7 +51,12 @@ export function projectConnectedModels(source) {
       if (!isRecord(model)) continue;
       const modelID = stringID(model.id);
       if (!modelID) continue;
-      const entry = { providerID, modelID, name: stringID(model.name) || modelID, acceptsImages: modelAcceptsImages(model) };
+      const entry = {
+        providerID,
+        modelID,
+        name: stringID(model.name) || modelID,
+        acceptsImages: modelAcceptsImages(model),
+      };
       models.push(entry);
       providerModels.push({ id: modelID, name: entry.name });
     }
@@ -76,25 +92,84 @@ export function isConnectedModel(catalog, providerID, modelID) {
   return catalog.models.some((entry) => entry.providerID === providerID && entry.modelID === modelID);
 }
 
+/** Bound provider/config catalog loads so a pending SDK call cannot stall a contact lane. */
+export const CONNECTED_CATALOG_TIMEOUT_MS = 8_000;
+
+const isAbortError = (error) => (
+  error?.name === 'AbortError'
+  || error?.code === 'ABORT_ERR'
+  || (typeof error?.message === 'string' && /aborted|timed out/i.test(error.message))
+);
+
 /**
  * Load the connected catalog from an OpenCode SDK client.
  * Failure is distinct from a successful empty catalog.
+ * Uses a bounded AbortSignal (default 8s) on provider.list + config.providers.
+ *
+ * @param {object} client
+ * @param {{ signal?: AbortSignal, timeoutMs?: number }} [options]
  */
-export async function loadConnectedCatalog(client) {
-  const listed = await client.provider.list({});
-  if (listed?.error || !isRecord(listed?.data)) {
-    const error = new Error('OpenCode provider list is unavailable');
-    error.code = 'upstream_error';
-    throw error;
+export async function loadConnectedCatalog(client, options = {}) {
+  const timeoutMs = Number.isFinite(options.timeoutMs) && options.timeoutMs > 0
+    ? Math.trunc(options.timeoutMs)
+    : CONNECTED_CATALOG_TIMEOUT_MS;
+  const parentSignal = options.signal;
+  const controller = new AbortController();
+  const onParentAbort = () => {
+    try {
+      controller.abort(parentSignal?.reason instanceof Error
+        ? parentSignal.reason
+        : new Error('Connected catalog aborted'));
+    } catch {
+      // ignore
+    }
+  };
+  if (parentSignal) {
+    if (parentSignal.aborted) onParentAbort();
+    else parentSignal.addEventListener('abort', onParentAbort, { once: true });
   }
-  const configured = await client.config.providers({});
-  if (configured?.error || !isRecord(configured?.data)) {
-    const error = new Error('OpenCode provider catalog is unavailable');
-    error.code = 'upstream_error';
+  const timer = setTimeout(() => {
+    try {
+      controller.abort(new Error(`Connected catalog timed out after ${timeoutMs}ms`));
+    } catch {
+      // ignore
+    }
+  }, timeoutMs);
+  timer.unref?.();
+
+  const requestOptions = { signal: controller.signal };
+  try {
+    const listed = await client.provider.list({}, requestOptions);
+    if (listed?.error || !isRecord(listed?.data)) {
+      const error = new Error('OpenCode provider list is unavailable');
+      error.code = 'upstream_error';
+      throw error;
+    }
+    const configured = await client.config.providers({}, requestOptions);
+    if (configured?.error || !isRecord(configured?.data)) {
+      const error = new Error('OpenCode provider catalog is unavailable');
+      error.code = 'upstream_error';
+      throw error;
+    }
+    return projectConnectedModels({
+      connected: listed.data.connected,
+      providers: configured.data.providers,
+    });
+  } catch (error) {
+    if (controller.signal.aborted || isAbortError(error)) {
+      const timedOut = typeof error?.message === 'string' && /timed out/i.test(error.message)
+        || (controller.signal.reason instanceof Error && /timed out/i.test(controller.signal.reason.message));
+      const next = new Error(
+        timedOut
+          ? `Connected catalog timed out after ${timeoutMs}ms`
+          : 'Connected catalog request was aborted',
+      );
+      next.code = 'upstream_error';
+      throw next;
+    }
     throw error;
+  } finally {
+    clearTimeout(timer);
+    parentSignal?.removeEventListener?.('abort', onParentAbort);
   }
-  return projectConnectedModels({
-    connected: listed.data.connected,
-    providers: configured.data.providers,
-  });
 }

package/server/lib/llm/catalog.test.js

@@ -1,5 +1,11 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import { loadConnectedCatalog, parseModelRef, projectConnectedModels } from './catalog.js'
+import {
+  CONNECTED_CATALOG_TIMEOUT_MS,
+  loadConnectedCatalog,
+  modelAcceptsImages,
+  parseModelRef,
+  projectConnectedModels,
+} from './catalog.js'
 
 describe('parseModelRef', () => {
   it('splits provider/model refs', () => {
@@ -22,6 +28,56 @@ describe('parseModelRef', () => {
   })
 })
 
+describe('modelAcceptsImages', () => {
+  it('prefers authoritative SDK capabilities.input.image (Grok-shaped)', () => {
+    // Real OpenCode Model shape from types.gen Model.capabilities
+    expect(modelAcceptsImages({
+      id: 'grok-4.6',
+      name: 'Grok 4.6',
+      capabilities: {
+        temperature: true,
+        reasoning: true,
+        attachment: true,
+        toolcall: true,
+        input: { text: true, audio: false, image: true, video: false, pdf: false },
+        output: { text: true, audio: false, image: false, video: false, pdf: false },
+        interleaved: false,
+      },
+    })).toBe(true)
+
+    expect(modelAcceptsImages({
+      id: 'deepseek-v4-flash',
+      capabilities: {
+        temperature: false,
+        reasoning: false,
+        attachment: false,
+        toolcall: true,
+        input: { text: true, audio: false, image: false, video: false, pdf: false },
+        output: { text: true, audio: false, image: false, video: false, pdf: false },
+        interleaved: false,
+      },
+    })).toBe(false)
+  })
+
+  it('does not let legacy attachment override explicit capabilities.input.image=false', () => {
+    expect(modelAcceptsImages({
+      attachment: true,
+      modalities: { input: ['text', 'image'] },
+      capabilities: {
+        attachment: false,
+        input: { text: true, image: false },
+      },
+    })).toBe(false)
+  })
+
+  it('falls back to legacy modalities/attachment when capabilities are absent', () => {
+    expect(modelAcceptsImages({ modalities: { input: ['text', 'image'] } })).toBe(true)
+    expect(modelAcceptsImages({ input: ['image'] })).toBe(true)
+    expect(modelAcceptsImages({ attachment: true })).toBe(true)
+    expect(modelAcceptsImages({ id: 'plain' })).toBe(false)
+  })
+})
+
 describe('projectConnectedModels', () => {
   it('projects only connected providers', () => {
     const catalog = projectConnectedModels({
@@ -46,21 +102,44 @@ describe('projectConnectedModels', () => {
     ])
   })
 
-  it('marks vision models from modalities or attachment', () => {
+  it('marks vision from SDK capabilities and legacy modalities', () => {
     const catalog = projectConnectedModels({
-      connected: ['openai'],
-      providers: [{
-        id: 'openai',
-        name: 'OpenAI',
-        models: {
-          'gpt-4o': { id: 'gpt-4o', name: 'GPT-4o', modalities: { input: ['text', 'image'] } },
-          'deepseek-v4-flash': { id: 'deepseek-v4-flash', name: 'deepseek-v4-flash' },
+      connected: ['openai', 'xai'],
+      providers: [
+        {
+          id: 'openai',
+          name: 'OpenAI',
+          models: {
+            'gpt-4o': { id: 'gpt-4o', name: 'GPT-4o', modalities: { input: ['text', 'image'] } },
+            'deepseek-v4-flash': { id: 'deepseek-v4-flash', name: 'deepseek-v4-flash' },
+          },
         },
-      }],
+        {
+          id: 'xai',
+          name: 'xAI',
+          models: {
+            'grok-4.6': {
+              id: 'grok-4.6',
+              name: 'Grok 4.6',
+              // Authoritative SDK shape — no modalities.input array
+              capabilities: {
+                temperature: true,
+                reasoning: true,
+                attachment: true,
+                toolcall: true,
+                input: { text: true, audio: false, image: true, video: false, pdf: false },
+                output: { text: true, audio: false, image: false, video: false, pdf: false },
+                interleaved: false,
+              },
+            },
+          },
+        },
+      ],
     })
     expect(catalog.models.find((model) => model.modelID === 'gpt-4o')?.acceptsImages).toBe(true)
+    expect(catalog.models.find((model) => model.modelID === 'grok-4.6')?.acceptsImages).toBe(true)
     expect(catalog.models.find((model) => model.modelID === 'deepseek-v4-flash')?.acceptsImages).toBe(false)
-    expect(catalog.connected).toEqual(['openai'])
+    expect(catalog.connected).toEqual(['openai', 'xai'])
   })
 })
 
@@ -75,4 +154,66 @@ describe('loadConnectedCatalog', () => {
       config: { providers: async () => ({ error: { status: 500 } }) },
     })).rejects.toThrow(/provider catalog/)
   })
+
+  it('passes AbortSignal to provider.list and config.providers', async () => {
+    const signals = []
+    const catalog = await loadConnectedCatalog({
+      provider: {
+        list: async (_params, options) => {
+          signals.push(options?.signal)
+          return { data: { connected: ['xai'] } }
+        },
+      },
+      config: {
+        providers: async (_params, options) => {
+          signals.push(options?.signal)
+          return {
+            data: {
+              providers: [{
+                id: 'xai',
+                name: 'xAI',
+                models: {
+                  'grok-4.6': {
+                    id: 'grok-4.6',
+                    name: 'Grok 4.6',
+                    capabilities: {
+                      input: { text: true, image: true },
+                      attachment: true,
+                    },
+                  },
+                },
+              }],
+            },
+          }
+        },
+      },
+    })
+    expect(signals).toHaveLength(2)
+    expect(signals[0]).toBeInstanceOf(AbortSignal)
+    expect(signals[1]).toBe(signals[0])
+    expect(catalog.models).toEqual([
+      expect.objectContaining({
+        providerID: 'xai',
+        modelID: 'grok-4.6',
+        acceptsImages: true,
+      }),
+    ])
+  })
+
+  it('fails closed when the catalog load exceeds the deadline', async () => {
+    await expect(loadConnectedCatalog({
+      provider: {
+        list: async (_params, options) => new Promise((resolve, reject) => {
+          const onAbort = () => reject(Object.assign(new Error('aborted'), { name: 'AbortError' }))
+          if (options?.signal?.aborted) onAbort()
+          else options?.signal?.addEventListener('abort', onAbort, { once: true })
+        }),
+      },
+      config: { providers: async () => ({ data: { providers: [] } }) },
+    }, { timeoutMs: 30 })).rejects.toMatchObject({
+      code: 'upstream_error',
+      message: expect.stringMatching(/timed out|aborted/i),
+    })
+    expect(CONNECTED_CATALOG_TIMEOUT_MS).toBeGreaterThan(0)
+  })
 })

package/server/lib/notifications/APNS.md

@@ -13,10 +13,12 @@ registered them — so a leaked device token alone can't be used to push.
    `POST /v1/push/register-token`, signed with its auto-generated ECDSA P-256 key
    (`getOrCreateRelayKeypair`, persisted in settings like the VAPID keys). The relay records
    `token → serverId` where `serverId = SHA-256(publicKey)`.
- 3. On a trigger (ready/error/question/permission/goal_*), the server composes **generic,
-    content-free** text — a **locale-specific** scenario title (from `apns-titles.js`, keyed off
-    the locale stored with each device token at `POST /api/push/apns-token`) + the **session name**
-    as the body, no model/project/message content — plus a **`badge`** count (see below).
+3. On a trigger (ready/error/question/permission/goal_*), the server composes **generic,
+     content-free** text — a **locale-specific** scenario title (from `apns-titles.js`, keyed off
+     the locale stored with each device token at `POST /api/push/apns-token`) + the **session name**
+     as the body, no model/project/message content — plus a **`badge`** count (see below).
+     Scheduled-task runs add `task_complete` / `task_error` scenario titles (task name as the
+     body, error text never crosses), gated by their own settings toggle.
     **Contact turns are the exception:** APNs keeps the assistant nickname as the title and the
     spoken message as the body (`preserveAlert`), and forwards `assistantID` so a tap opens that
     conversation. Tokens are grouped by locale (relay signatures cover `title`, so mixed locales
@@ -60,6 +62,20 @@ dismissalDate?, staleDate?, publicKeyJwk, ts, sig }` signed over
 Direct mode uses HTTP/2 token auth, `apns-topic: ${bundleId}.push-type.liveactivity`,
 `apns-push-type: liveactivity`, and no alert.
 
+While sessions are still working, a periodic refresh
+(`live-activity-refresh-runtime.js`, default every 30s,
+`OPENCHAMBER_LIVE_ACTIVITY_REFRESH_INTERVAL_MS`, `0` disables) recomputes each
+persisted Live Activity snapshot from the authoritative server-side session
+states and pushes an **update** only when something changed — a busy→retry
+transition, a newly visible top-level session, a missed idle completion, or a
+stale row recovering to working. Unchanged snapshots never send, because APNs
+budgets Live Activity updates per hour. Update payloads reuse the signed
+live-activity contract above (`staleDate = updatedAt + 20min`, snapshot `items`
+with `sessionID`/`title`/`status` rows — the same shape the foreground app
+writes via ActivityKit); when the recomputed snapshot has no working row left,
+the refresh sends `end` and clears accepted tokens locally. A tick is a no-op
+(one token-store read) when no device registered a Live Activity token.
+
 The APNs / relay payload **must not** carry `sessionId` or user/session content.
 `contentState` is only `{ status, eventVersion, updatedAt, endedAt }`.
 `complete` uses a 15-minute dismissal and `error` a 60-minute dismissal (same as

package/server/lib/notifications/DOCUMENTATION.md

@@ -10,6 +10,7 @@ This module provides notification message preparation utilities for the web serv
 - `packages/web/server/lib/notifications/apns-runtime.js`: native iOS APNs device-token persistence + delivery, plus a separate Live Activity token store and `end` send path. Two modes: **relay** (default — sign + POST tokens + generic text to the isolated Push Relay in `packages/relay-server/src/push/`, which holds the project APNs key) and **direct** (fallback — sign ES256 JWT with Node crypto + HTTP/2, when `OPENCHAMBER_PUSH_RELAY_DISABLED=true`). Unless `OPENCHAMBER_PUSH_RELAY_URL` is set, the Host maps the effective Relay `wss`/`ws` URL to the same host as `https`/`http` `/v1/push/send`. Before each relay send, the runtime checks an in-memory registration success cache (keyed by current register URL + token + platform) and only POSTs `/v1/push/register-token` for cache misses; only successfully bound tokens are sent. Switching Relay/Push URL clears that cache so persisted tokens re-bind to the new origin on the next send or `reRegisterAllTokens()`. Each server has an auto-generated ECDSA P-256 keypair (`getOrCreateRelayKeypair`, persisted in settings); it binds tokens on the relay (`/v1/push/register-token`) and signs every relay request, so the relay only delivers to tokens bound to that server. APNs is the native app's sole notification channel (no local notifications) and is NOT gated on UI visibility — iOS suppresses the foreground banner instead. Mobile push carries only generic text (scenario title + session name) — see `APNS.md`. Live Activity tokens are persisted beside alert tokens in the same file (`version` 2, `liveActivityTokensBySession`) without mixing the two token types; v1 files remain readable. Live Activity relay bind/send uses `/v1/push/register-live-activity-token`, `/v1/push/unregister-live-activity-token`, and `/v1/push/live-activity`.
 - `packages/web/server/lib/notifications/emitter-runtime.js`: desktop/stdout + UI SSE notification emission runtime.
 - `packages/web/server/lib/notifications/runtime.js`: trigger runtime for OpenCode event-driven notification fanout.
+- `packages/web/server/lib/notifications/live-activity-refresh-runtime.js`: periodic Live Activity snapshot refresh (default 30s, `OPENCHAMBER_LIVE_ACTIVITY_REFRESH_INTERVAL_MS` overrides, `0` disables). Each tick snapshots the authoritative session states once, recomputes every persisted Live Activity token's snapshot, and pushes updates only for real changes — busy→retry transitions, newly visible top-level sessions, idle completions the event path missed, and stale-row recovery. Entries whose recomputed snapshot is unchanged never send (APNs budgets Live Activity updates per hour). Rows for sessions without authoritative server state are preserved as-is; server-side-only sub-states (`permission`/`input`/`tool`) keep their last value while the session stays busy. When no row is working anymore the refresh sends `end` and clears accepted tokens.
 - `packages/web/server/lib/notifications/template-runtime.js`: notification template variables and session text/title enrichment runtime. Zen-model helpers are retained as compatibility stubs only.
 - `packages/web/server/lib/notifications/message.js`: helper implementation module.
 - `packages/web/server/lib/notifications/message.test.js`: unit tests for notification message helpers.
@@ -46,8 +47,11 @@ This module provides notification message preparation utilities for the web serv
 - `createNotificationTriggerRuntime(dependencies)`: creates runtime-owned debounced trigger handling for OpenCode events.
 - Returned API:
   - `maybeSendPushForTrigger(payload)`
+  - `resolveLiveActivitySessionCandidate(sessionId)` — sidebar candidate for a new Live Activity refresh row: `{ title, visible }` under the same suppression rules as ordinary push. Cache-first across any cached directory, then the directory-less OpenCode session endpoint; a missing meta resolves as not-visible.
+  - `sendScheduledTaskRunNotification({ projectID, taskID, taskName, status, sessionId?, reason, errorMessage? })` — scheduled-tasks runtime callback when a scheduled (non-manual) run settles. Gated by `notifyOnScheduledTasks`; manual runs always skip. Desktop/UI SSE carry the task name (plus error text on failure); push follows the generic contract (`task_complete`/`task_error` scenario titles, task name as APNs body, `scheduled-<projectID>-<taskID>` collapse tag).
 - Owns:
   - top-level completion/question/permission trigger routing; completion is the sole task-status notification. Ordinary push is limited to sidebar-visible root sessions. Child/subagent sessions, Assistant bindings (`openchamber.assistant.assistantID` unless `assigned.from === 'contact'`), scheduled-task sessions, small-model system sessions (`metadata.openchamber.smallModel.purpose`), LLM gateway throwaway sessions (`metadata.openchamber.llm.purpose`), and `smartfetch-secondary` titles are suppressed. Contact-assigned workers stay visible and still notify.
+  - per-event settings gates: `notifyOnCompletion` (ready), `notifyOnQuestion` (question), `notifyOnPermission` (permission — independent of the question toggle), `notifyOnAssistants` (contact turns), `notifyOnGoals` (goal settle push), `notifyOnScheduledTasks` (scheduled task runs); all default to enabled via the settings migration.
   - contact-turn notifications (`sendContactTurnNotification`) are a separate SMS-style path: title is the assistant nickname, body is the spoken message text, on desktop / UI SSE / web-push / APNs. APNs does **not** rewrite these into the generic "Task completed" scenario title.
   - top-level completion/error Live Activity `end` (`sendLiveActivityEnd`), independent of ordinary push settings and UI visibility, with the same hidden-session suppression; duplicate terminal events are idempotent at the token store
   - session meta cache for sidebar-visibility suppression
@@ -77,6 +81,7 @@ This module provides notification message preparation utilities for the web serv
   - `addOrUpdateLiveActivityToken(uiSessionToken, token, activityId, sessionId)` — idempotent upsert bound to the UI session + OpenCode `sessionId` + ActivityKit `activityId`. Token refresh replaces that activity's previous token. Caps per UI session and lazily expires stale entries. Binds on the relay (`/v1/push/register-live-activity-token`, `kind: "liveactivity"`). Does not log tokens or session ids.
   - `removeLiveActivityToken(uiSessionToken, token)` — owning UI session only; unregisters from the relay when no local copies remain.
   - `sendLiveActivityEnd({ sessionId, status, eventVersion?, endedAt? })` — looks up Live Activity tokens for that OpenCode session and sends `event: "end"` with `contentState` `{ status, eventVersion, updatedAt, endedAt }` only. `complete` dismisses after 15 minutes, `error` after 60 minutes (same as native). `staleDate` (`updatedAt + 20min`) is update-only and omitted on end. `eventVersion` is monotonic per session using current milliseconds. Relay body follows the signed live-activity contract; direct mode uses token auth, topic `${bundleId}.push-type.liveactivity`, `apns-push-type: liveactivity`, and no alert. APNs payloads must not carry `sessionId` or user content. Successfully accepted tokens are cleared locally; failures do not drop alert tokens or block ordinary push.
+  - `refreshLiveActivityTokens({ computeSnapshot })` — periodic refresh entrypoint for `live-activity-refresh-runtime.js`. The async `computeSnapshot(entry)` returns `{ items }` (unix seconds) when that entry's snapshot changed or `null` to skip; unchanged entries never send. Changed snapshots bump the aggregate `liveActivityEventVersions` entry, persist, and deliver an `update` (with `staleDate`) grouped by identical snapshot — or an `end` plus local token cleanup once no row is working. Delivery shares the same relay/direct path as `sendLiveActivityEnd`.
   - `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()`

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

@@ -1120,6 +1120,140 @@ export const createApnsRuntime = (deps) => {
     return entries;
   };
 
+  // Shared Live Activity delivery path (relay register-then-send, or direct APNs).
+  // Returns the tokens APNs accepted; callers decide what an accepted `end` means.
+  const deliverLiveActivityPayload = async (tokens, payload) => {
+    const accepted = [];
+    const relay = await resolveRelayConfig();
+    if (relay) {
+      rememberLiveActivityRelayRegisterUrl(relay.liveActivityRegisterUrl);
+      const outcomes = await mapWithBoundedConcurrency(
+        tokens,
+        RELAY_REGISTER_CONCURRENCY,
+        async (token) => {
+          const registered = await registerLiveActivityTokenWithRelay(token, relay);
+          return registered ? token : null;
+        },
+      );
+      const readyTokens = outcomes.filter((token) => typeof token === 'string');
+      if (readyTokens.length > 0) {
+        accepted.push(...await sendLiveActivityViaRelay(readyTokens, payload, relay));
+      }
+    } else {
+      accepted.push(...await sendLiveActivityViaDirectApns(tokens, payload));
+    }
+    return accepted;
+  };
+
+  // Periodic refresh entrypoint (see live-activity-refresh-runtime.js). For every
+  // persisted Live Activity entry the async `computeSnapshot(entry)` returns the
+  // next snapshot items (unix seconds) or null to skip; unchanged snapshots send
+  // nothing. Changed snapshots bump the aggregate event version, persist, and
+  // deliver an `update` — or an `end` (clearing accepted tokens) once no row is
+  // working anymore.
+  const refreshLiveActivityTokens = async ({ computeSnapshot } = {}) => {
+    if (typeof computeSnapshot !== 'function') return;
+    const now = Date.now();
+    const store = await readTokensFromDisk();
+    const pruned = pruneLiveActivityTokensBySession(store.liveActivityTokensBySession, now);
+    const entries = [];
+    const seen = new Set();
+    for (const record of Object.values(pruned)) {
+      for (const entry of record) {
+        if (seen.has(entry.token)) continue;
+        seen.add(entry.token);
+        entries.push(entry);
+      }
+    }
+    if (entries.length === 0) return;
+
+    const nextItemsByToken = new Map();
+    for (const entry of entries) {
+      let next = null;
+      try {
+        next = await computeSnapshot(entry);
+      } catch {
+        next = null;
+      }
+      if (next && Array.isArray(next.items)) nextItemsByToken.set(entry.token, next.items);
+    }
+    if (nextItemsByToken.size === 0) return;
+
+    const planned = [];
+    let nextVersion = 0;
+    await persistTokenUpdate((current) => {
+      const liveActivityTokensBySession = pruneLiveActivityTokensBySession(
+        current.liveActivityTokensBySession,
+        now,
+      );
+      const previous = current.liveActivityEventVersions?.[LIVE_ACTIVITY_AGGREGATE_SESSION_ID];
+      nextVersion = nextLiveActivityEventVersion(now, previous);
+      let plannedInRun = [];
+      for (const [uiSessionToken, record] of Object.entries(liveActivityTokensBySession)) {
+        const nextRecord = record.map((entry) => {
+          const items = nextItemsByToken.get(entry.token);
+          if (!items) return entry;
+          plannedInRun.push({ token: entry.token, items });
+          return { ...entry, snapshot: items };
+        });
+        liveActivityTokensBySession[uiSessionToken] = nextRecord;
+      }
+      planned.push(...plannedInRun);
+      return {
+        ...current,
+        liveActivityTokensBySession,
+        liveActivityEventVersions: {
+          ...(current.liveActivityEventVersions || {}),
+          [LIVE_ACTIVITY_AGGREGATE_SESSION_ID]: nextVersion,
+        },
+      };
+    });
+    if (planned.length === 0) return;
+
+    // Entries with identical snapshots share one APNs payload.
+    const signatureOf = (items) => items
+      .map((item) => `${item.sessionId}\0${item.title}\0${item.status}\0${item.endedAt ?? ''}`)
+      .join('\n');
+    const groups = new Map();
+    for (const plan of planned) {
+      const working = plan.items.filter((item) => liveActivityItemIsWorking(item.status));
+      const key = signatureOf(plan.items);
+      const group = groups.get(key) ?? { items: plan.items, tokens: [] };
+      group.tokens.push(plan.token);
+      groups.set(key, group);
+    }
+
+    const updatedAtSeconds = now / 1000;
+    const tokensToEnd = [];
+    for (const group of groups.values()) {
+      const working = group.items.filter((item) => liveActivityItemIsWorking(item.status));
+      const isEnd = working.length === 0;
+      const status = isEnd
+        ? (group.items.some((item) => item.status === 'error') ? 'error' : 'complete')
+        : (working[0]?.status || 'working');
+      const payload = {
+        event: isEnd ? 'end' : 'update',
+        contentState: contentStateFromSnapshot(
+          group.items,
+          status,
+          nextVersion,
+          updatedAtSeconds,
+          isEnd ? updatedAtSeconds : undefined,
+        ),
+        ...liveActivityPushDates(isEnd ? 'end' : 'update', status, updatedAtSeconds, now),
+      };
+      let accepted = [];
+      try {
+        accepted = await deliverLiveActivityPayload(group.tokens, payload);
+      } catch (error) {
+        console.warn('[Live Activity] refresh failed:', error?.message ?? error);
+        continue;
+      }
+      if (isEnd && accepted.length > 0) tokensToEnd.push(...accepted);
+    }
+    if (tokensToEnd.length > 0) await removeLiveActivityTokens(tokensToEnd);
+  };
+
   const sendLiveActivityEnd = async ({ sessionId, status, eventVersion, endedAt, title } = {}) => {
     const trimmedSessionId = typeof sessionId === 'string' ? sessionId.trim() : '';
     if (!isLimitedId(trimmedSessionId, MAX_LIVE_ACTIVITY_ID_CHARS)) return;
@@ -1217,24 +1351,7 @@ export const createApnsRuntime = (deps) => {
     const tokens = pendingEntries.map((entry) => entry.token);
     let accepted = [];
     try {
-      const relay = await resolveRelayConfig();
-      if (relay) {
-        rememberLiveActivityRelayRegisterUrl(relay.liveActivityRegisterUrl);
-        const outcomes = await mapWithBoundedConcurrency(
-          tokens,
-          RELAY_REGISTER_CONCURRENCY,
-          async (token) => {
-            const registered = await registerLiveActivityTokenWithRelay(token, relay);
-            return registered ? token : null;
-          },
-        );
-        const readyTokens = outcomes.filter((token) => typeof token === 'string');
-        if (readyTokens.length > 0) {
-          accepted = await sendLiveActivityViaRelay(readyTokens, payload, relay);
-        }
-      } else {
-        accepted = await sendLiveActivityViaDirectApns(tokens, payload);
-      }
+      accepted = await deliverLiveActivityPayload(tokens, payload);
     } catch (error) {
       console.warn('[Live Activity] end failed:', error?.message ?? error);
       return;
@@ -1332,6 +1449,7 @@ export const createApnsRuntime = (deps) => {
     addOrUpdateLiveActivityToken,
     removeLiveActivityToken,
     sendLiveActivityEnd,
+    refreshLiveActivityTokens,
     sendApnsToAllUiSessions,
     reRegisterAllTokens,
     resolveApnsConfig,