@openchambery/web 1.19.0-beta.9 → 1.19.0

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

@@ -2,6 +2,7 @@ import crypto from 'node:crypto';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import { createApnsRuntime } from './apns-runtime.js';
+import { resolveEffectiveRelayUrl } from '../relay/service.js';
 
 // A real P-256 key so the ES256 signing path (direct mode) runs for real.
 const { privateKey } = crypto.generateKeyPairSync('ec', { namedCurve: 'P-256' });
@@ -38,6 +39,7 @@ const makeDeps = (overrides = {}) => {
     APNS_TOKENS_FILE_PATH: '/tmp/apns-tokens.json',
     readSettingsFromDiskMigrated: vi.fn(async () => settings),
     writeSettingsToDisk: vi.fn(async (next) => { settings = next; }),
+    resolveEffectiveRelayUrl: async () => resolveEffectiveRelayUrl({ settings }),
     ...overrides,
   };
 };
@@ -69,6 +71,44 @@ afterEach(() => {
   vi.unstubAllGlobals();
   delete process.env.OPENCHAMBER_PUSH_RELAY_URL;
   delete process.env.OPENCHAMBER_PUSH_RELAY_DISABLED;
+  delete process.env.OPENCHAMBER_RELAY_URL;
+  delete process.env.OPENCHAMBER_APNS_KEY_ID;
+  delete process.env.OPENCHAMBER_APNS_TEAM_ID;
+  delete process.env.OPENCHAMBER_APNS_P8;
+  delete process.env.OPENCHAMBER_APNS_BUNDLE_ID;
+});
+
+describe('apns runtime bundle ID', () => {
+  it('defaults to the current product bundle ID 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({ bundleId: 'com.yee94.openchamber' });
+  });
+
+  it('prefers OPENCHAMBER_APNS_BUNDLE_ID over the default and settings', async () => {
+    process.env.OPENCHAMBER_APNS_BUNDLE_ID = 'com.example.app';
+    const runtime = createApnsRuntime(
+      makeDeps({
+        readSettingsFromDiskMigrated: vi.fn(async () => ({
+          apnsConfig: { ...APNS_CONFIG, bundleId: 'com.example.settings' },
+        })),
+      }),
+    );
+    await expect(runtime.resolveApnsConfig()).resolves.toMatchObject({ bundleId: 'com.example.app' });
+  });
+
+  it('prefers settings.apnsConfig.bundleId over the default', async () => {
+    const runtime = createApnsRuntime(
+      makeDeps({
+        readSettingsFromDiskMigrated: vi.fn(async () => ({
+          apnsConfig: { ...APNS_CONFIG, bundleId: 'com.example.settings' },
+        })),
+      }),
+    );
+    await expect(runtime.resolveApnsConfig()).resolves.toMatchObject({ bundleId: 'com.example.settings' });
+  });
 });
 
 describe('apns runtime relay mode (default)', () => {
@@ -151,6 +191,36 @@ describe('apns runtime relay mode (default)', () => {
     await runtime.sendApnsToAllUiSessions({ title: 't', body: 'b' });
     expect(fetchMock).not.toHaveBeenCalled();
   });
+
+  it('omits relay collapseId when CJK/emoji tags exceed 64 UTF-8 bytes', 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());
+    await runtime.addOrUpdateApnsToken('s1', 'tokenA');
+
+    const sendTag = async (tag) => {
+      fetchMock.mockClear();
+      await runtime.sendApnsToAllUiSessions({ title: 't', body: 'b', tag });
+      const sent = JSON.parse(fetchMock.mock.calls.find(isSend)[1].body);
+      return Object.prototype.hasOwnProperty.call(sent, 'collapseId') ? sent.collapseId : undefined;
+    };
+
+    const cjkKeep = '会话'.repeat(10); // 60 bytes
+    const cjkOmit = '会话'.repeat(11); // 66 bytes
+    const emojiKeep = '🎉'.repeat(16); // 64 bytes
+    const emojiOmit = '🎉'.repeat(17); // 68 bytes
+    expect(Buffer.byteLength(cjkKeep, 'utf8')).toBeLessThanOrEqual(64);
+    expect(Buffer.byteLength(cjkOmit, 'utf8')).toBeGreaterThan(64);
+    expect(Buffer.byteLength(emojiKeep, 'utf8')).toBe(64);
+    expect(Buffer.byteLength(emojiOmit, 'utf8')).toBeGreaterThan(64);
+
+    expect(await sendTag('ready-x')).toBe('ready-x');
+    expect(await sendTag(cjkKeep)).toBe(cjkKeep);
+    expect(await sendTag(cjkOmit)).toBeUndefined();
+    expect(await sendTag(emojiKeep)).toBe(emojiKeep);
+    expect(await sendTag(emojiOmit)).toBeUndefined();
+  });
 });
 
 describe('apns runtime direct fallback (relay disabled)', () => {
@@ -186,6 +256,57 @@ describe('apns runtime direct fallback (relay disabled)', () => {
     expect(targeted).toEqual(['tokenDirect']);
   });
 
+  it('keeps direct APNs collapse-id within 64 UTF-8 bytes and omits CJK/emoji over the limit', async () => {
+    process.env.OPENCHAMBER_PUSH_RELAY_DISABLED = 'true';
+    const collapseIds = [];
+    const http2 = {
+      connect: () => ({
+        on: () => {},
+        close: () => {},
+        request: (headers) => {
+          collapseIds.push(headers['apns-collapse-id']);
+          const listeners = {};
+          const req = {
+            on: (event, cb) => { listeners[event] = cb; return req; },
+            setEncoding: () => req,
+            end: () => {
+              queueMicrotask(() => {
+                listeners.response?.({ ':status': '200' });
+                listeners.end?.();
+              });
+            },
+          };
+          return req;
+        },
+      }),
+    };
+    const runtime = createApnsRuntime(
+      makeDeps({ http2, readSettingsFromDiskMigrated: vi.fn(async () => ({ apnsConfig: APNS_CONFIG })) }),
+    );
+    await runtime.addOrUpdateApnsToken('s', 'tokenDirect');
+
+    const sendTag = async (tag) => {
+      collapseIds.length = 0;
+      await runtime.sendApnsToAllUiSessions({ title: 't', body: 'b', tag });
+      return collapseIds[0];
+    };
+
+    const cjkKeep = '会话'.repeat(10); // 60 bytes
+    const cjkOmit = '会话'.repeat(11); // 66 bytes
+    const emojiKeep = '🎉'.repeat(16); // 64 bytes
+    const emojiOmit = '🎉'.repeat(17); // 68 bytes
+    expect(Buffer.byteLength(cjkKeep, 'utf8')).toBeLessThanOrEqual(64);
+    expect(Buffer.byteLength(cjkOmit, 'utf8')).toBeGreaterThan(64);
+    expect(Buffer.byteLength(emojiKeep, 'utf8')).toBe(64);
+    expect(Buffer.byteLength(emojiOmit, 'utf8')).toBeGreaterThan(64);
+
+    expect(await sendTag('ready-x')).toBe('ready-x');
+    expect(await sendTag(cjkKeep)).toBe(cjkKeep);
+    expect(await sendTag(cjkOmit)).toBeUndefined();
+    expect(await sendTag(emojiKeep)).toBe(emojiKeep);
+    expect(await sendTag(emojiOmit)).toBeUndefined();
+  });
+
   it('signApnsJwt produces a 3-part ES256 token with the expected header/claims', () => {
     const runtime = createApnsRuntime(makeDeps());
     const parts = runtime.signApnsJwt(APNS_CONFIG).split('.');
@@ -193,4 +314,330 @@ describe('apns runtime direct fallback (relay disabled)', () => {
     expect(JSON.parse(Buffer.from(parts[0], 'base64url').toString())).toEqual({ alg: 'ES256', kid: 'KEY123' });
     expect(JSON.parse(Buffer.from(parts[1], 'base64url').toString()).iss).toBe('TEAM123');
   });
+
+  it('does not register tokens with the push relay in direct mode', async () => {
+    process.env.OPENCHAMBER_PUSH_RELAY_DISABLED = 'true';
+    const fetchMock = vi.fn(async () => jsonResponse({ ok: true }));
+    vi.stubGlobal('fetch', fetchMock);
+    const http2 = {
+      connect: () => ({
+        on: () => {},
+        close: () => {},
+        request: (headers) => {
+          const listeners = {};
+          const req = {
+            on: (event, cb) => { listeners[event] = cb; return req; },
+            setEncoding: () => req,
+            end: () => {
+              queueMicrotask(() => {
+                listeners.response?.({ ':status': '200' });
+                listeners.end?.();
+              });
+            },
+          };
+          return req;
+        },
+      }),
+    };
+    const runtime = createApnsRuntime(
+      makeDeps({ http2, readSettingsFromDiskMigrated: vi.fn(async () => ({ apnsConfig: APNS_CONFIG })) }),
+    );
+    await runtime.addOrUpdateApnsToken('s', 'tokenDirect');
+    await runtime.sendApnsToAllUiSessions({ title: 't', body: 'b' });
+    await expect(runtime.reRegisterAllTokens()).resolves.toEqual({ attempted: 0, succeeded: 0, failed: 0 });
+    expect(fetchMock).not.toHaveBeenCalled();
+  });
+});
+
+describe('apns runtime push relay derivation and re-register', () => {
+  const registerUrls = (fetchMock) =>
+    fetchMock.mock.calls.filter(isRegister).map(([url]) => url);
+  const sendUrls = (fetchMock) =>
+    fetchMock.mock.calls.filter(([url]) => String(url).endsWith('/v1/push/send')).map(([url]) => url);
+
+  it('prefers OPENCHAMBER_PUSH_RELAY_URL over derived relay URLs', async () => {
+    process.env.OPENCHAMBER_RELAY_URL = 'wss://env.example/ws';
+    process.env.OPENCHAMBER_PUSH_RELAY_URL = 'https://explicit.test/v1/push/send';
+    const fetchMock = vi.fn(async () => jsonResponse({ ok: true, results: [] }));
+    vi.stubGlobal('fetch', fetchMock);
+
+    let settings = { privateRelay: { enabled: true, relayUrl: 'wss://settings.example/ws' } };
+    const runtime = createApnsRuntime(makeDeps({
+      readSettingsFromDiskMigrated: async () => settings,
+      writeSettingsToDisk: async (next) => { settings = next; },
+      resolveEffectiveRelayUrl: async () => resolveEffectiveRelayUrl({ settings }),
+    }));
+    await runtime.addOrUpdateApnsToken('s1', 'tokenA');
+    expect(registerUrls(fetchMock)).toEqual(['https://explicit.test/v1/push/register-token']);
+  });
+
+  it('derives the push send URL from settings then env relay URLs', async () => {
+    const fetchMock = vi.fn(async () => jsonResponse({ ok: true, results: [] }));
+    vi.stubGlobal('fetch', fetchMock);
+
+    let settings = { privateRelay: { enabled: true, relayUrl: 'wss://settings.example/custom' } };
+    const runtime = createApnsRuntime(makeDeps({
+      readSettingsFromDiskMigrated: async () => settings,
+      writeSettingsToDisk: async (next) => { settings = next; },
+      resolveEffectiveRelayUrl: async () => resolveEffectiveRelayUrl({ settings }),
+    }));
+
+    await runtime.addOrUpdateApnsToken('s1', 'tokenA');
+    expect(registerUrls(fetchMock)).toEqual(['https://settings.example/v1/push/register-token']);
+
+    fetchMock.mockClear();
+    process.env.OPENCHAMBER_RELAY_URL = 'wss://env.example/ws';
+    await runtime.addOrUpdateApnsToken('s1', 'tokenA');
+    expect(registerUrls(fetchMock)).toEqual(['https://env.example/v1/push/register-token']);
+  });
+
+  it('defaults to the hosted relay push endpoint', async () => {
+    const fetchMock = vi.fn(async () => jsonResponse({ ok: true, results: [] }));
+    vi.stubGlobal('fetch', fetchMock);
+    const runtime = createApnsRuntime(makeDeps());
+    await runtime.addOrUpdateApnsToken('s1', 'tokenA');
+    expect(registerUrls(fetchMock)).toEqual(['https://relay.openchamber.dev/v1/push/register-token']);
+  });
+
+  it('re-registers persisted tokens against the current relay', async () => {
+    process.env.OPENCHAMBER_PUSH_RELAY_URL = 'https://relay-a.test/v1/push/send';
+    const fetchMock = vi.fn(async () => jsonResponse({ ok: true, results: [] }));
+    vi.stubGlobal('fetch', fetchMock);
+    const runtime = createApnsRuntime(makeDeps());
+    await runtime.addOrUpdateApnsToken('s1', 'tokenA');
+    await runtime.addOrUpdateApnsToken('s2', 'tokenB');
+    await runtime.addOrUpdateApnsToken('s3', 'tokenA');
+
+    process.env.OPENCHAMBER_PUSH_RELAY_URL = 'https://relay-b.test/v1/push/send';
+    fetchMock.mockClear();
+    await expect(runtime.reRegisterAllTokens()).resolves.toEqual({
+      attempted: 2,
+      succeeded: 2,
+      failed: 0,
+    });
+    expect(registerUrls(fetchMock).every((url) => url === 'https://relay-b.test/v1/push/register-token')).toBe(true);
+    expect(registerUrls(fetchMock)).toHaveLength(2);
+    expect(sendUrls(fetchMock)).toEqual([]);
+  });
+
+  it('registers with the new relay before the first send after a switch', async () => {
+    process.env.OPENCHAMBER_PUSH_RELAY_URL = 'https://relay-a.test/v1/push/send';
+    const fetchMock = vi.fn(async () => jsonResponse({ ok: true, results: [] }));
+    vi.stubGlobal('fetch', fetchMock);
+    const runtime = createApnsRuntime(makeDeps());
+    await runtime.addOrUpdateApnsToken('s1', 'tokenA');
+
+    process.env.OPENCHAMBER_PUSH_RELAY_URL = 'https://relay-b.test/v1/push/send';
+    fetchMock.mockClear();
+    await runtime.sendApnsToAllUiSessions({ title: 't', body: 'b' });
+
+    expect(fetchMock.mock.calls.map(([url]) => url)).toEqual([
+      'https://relay-b.test/v1/push/register-token',
+      'https://relay-b.test/v1/push/send',
+    ]);
+  });
+
+  it('sends only tokens that registered successfully after a partial failure', async () => {
+    process.env.OPENCHAMBER_PUSH_RELAY_URL = 'https://relay-a.test/v1/push/send';
+    const fetchMock = vi.fn(async (url, init) => {
+      if (String(url).endsWith('/register-token')) {
+        const body = JSON.parse(init.body);
+        if (body.token === 'tokenB') return jsonResponse({ error: true }, 500);
+        return jsonResponse({ ok: true });
+      }
+      return jsonResponse({ results: [] });
+    });
+    vi.stubGlobal('fetch', fetchMock);
+    const runtime = createApnsRuntime(makeDeps());
+    await runtime.addOrUpdateApnsToken('s1', 'tokenA');
+    await runtime.addOrUpdateApnsToken('s2', 'tokenB');
+
+    process.env.OPENCHAMBER_PUSH_RELAY_URL = 'https://relay-b.test/v1/push/send';
+    fetchMock.mockClear();
+    await runtime.sendApnsToAllUiSessions({ title: 't', body: 'b' });
+
+    const registerBodies = fetchMock.mock.calls
+      .filter(isRegister)
+      .map(([, init]) => JSON.parse(init.body).token)
+      .sort();
+    expect(registerBodies).toEqual(['tokenA', 'tokenB']);
+    expect(sendUrls(fetchMock)).toEqual(['https://relay-b.test/v1/push/send']);
+    expect(JSON.parse(fetchMock.mock.calls.find(([url]) => String(url).endsWith('/v1/push/send'))[1].body).tokens).toEqual(['tokenA']);
+
+    fetchMock.mockClear();
+    await runtime.sendApnsToAllUiSessions({ title: 't', body: 'b' });
+    const retryRegister = fetchMock.mock.calls.filter(isRegister).map(([, init]) => JSON.parse(init.body).token);
+    expect(retryRegister).toEqual(['tokenB']);
+    expect(JSON.parse(fetchMock.mock.calls.find(([url]) => String(url).endsWith('/v1/push/send'))[1].body).tokens).toEqual(['tokenA']);
+  });
+
+  it('warns without leaking the URL when the resolver returns a non-WebSocket URL, then falls back to default', async () => {
+    const fetchMock = vi.fn(async () => jsonResponse({ ok: true, results: [] }));
+    vi.stubGlobal('fetch', fetchMock);
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    const leaked = 'https://evil.example/v1/push/send?token=secret';
+    const runtime = createApnsRuntime(makeDeps({
+      resolveEffectiveRelayUrl: async () => leaked,
+    }));
+
+    try {
+      await runtime.addOrUpdateApnsToken('s1', 'tokenA');
+      expect(registerUrls(fetchMock)).toEqual(['https://relay.openchamber.dev/v1/push/register-token']);
+      expect(warn).toHaveBeenCalled();
+      const messages = warn.mock.calls.map((args) => args.map(String).join(' ')).join('\n');
+      expect(messages).toContain('falling back to default');
+      expect(messages).not.toContain(leaked);
+      expect(messages).not.toContain('evil.example');
+      expect(messages).not.toContain('secret');
+      expect(messages).not.toContain('token=');
+    } finally {
+      warn.mockRestore();
+    }
+  });
+
+  it('warns without leaking the error when the resolver throws, then falls back to default', async () => {
+    const fetchMock = vi.fn(async () => jsonResponse({ ok: true, results: [] }));
+    vi.stubGlobal('fetch', fetchMock);
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    const leaked = 'wss://evil.example/ws?token=secret';
+    const runtime = createApnsRuntime(makeDeps({
+      resolveEffectiveRelayUrl: async () => {
+        throw new Error(leaked);
+      },
+    }));
+
+    try {
+      await runtime.addOrUpdateApnsToken('s1', 'tokenA');
+      expect(registerUrls(fetchMock)).toEqual(['https://relay.openchamber.dev/v1/push/register-token']);
+      expect(warn).toHaveBeenCalled();
+      const messages = warn.mock.calls.map((args) => args.map(String).join(' ')).join('\n');
+      expect(messages).toContain('falling back to default');
+      expect(messages).not.toContain(leaked);
+      expect(messages).not.toContain('evil.example');
+      expect(messages).not.toContain('secret');
+      expect(messages).not.toContain('token=');
+    } finally {
+      warn.mockRestore();
+    }
+  });
+
+  it('sends more than 100 tokens in batches of at most 100, each token exactly once', async () => {
+    process.env.OPENCHAMBER_PUSH_RELAY_URL = 'https://relay.test/v1/push/send';
+    const fetchMock = vi.fn(async (url) =>
+      String(url).endsWith('/register-token')
+        ? jsonResponse({ ok: true })
+        : jsonResponse({ results: [] }),
+    );
+    vi.stubGlobal('fetch', fetchMock);
+    const runtime = createApnsRuntime(makeDeps());
+    const tokens = Array.from({ length: 101 }, (_, i) => `token${String(i).padStart(3, '0')}`);
+    for (const [i, token] of tokens.entries()) {
+      await runtime.addOrUpdateApnsToken(`s${i}`, token);
+    }
+
+    fetchMock.mockClear();
+    await runtime.sendApnsToAllUiSessions({ title: 't', body: 'b' });
+
+    const sendCalls = fetchMock.mock.calls.filter(([url]) => String(url).endsWith('/v1/push/send'));
+    expect(sendCalls).toHaveLength(2);
+    const batches = sendCalls.map(([, init]) => JSON.parse(init.body).tokens);
+    expect(batches.every((batch) => Array.isArray(batch) && batch.length > 0 && batch.length <= 100)).toBe(true);
+    const sent = batches.flat();
+    expect(sent).toHaveLength(101);
+    expect(new Set(sent).size).toBe(101);
+    expect(new Set(sent)).toEqual(new Set(tokens));
+    for (const [, init] of sendCalls) {
+      const sentBody = JSON.parse(init.body);
+      const sendMessage = `${sentBody.ts}.${[...sentBody.tokens].sort().join(',')}.${sentBody.title}`;
+      expect(await verifyRelaySignature(sentBody.publicKeyJwk, sendMessage, sentBody.sig)).toBe(true);
+    }
+  });
+
+  it('continues remaining send batches when one batch fails', async () => {
+    process.env.OPENCHAMBER_PUSH_RELAY_URL = 'https://relay.test/v1/push/send';
+    let sendCount = 0;
+    const fetchMock = vi.fn(async (url) => {
+      if (String(url).endsWith('/register-token')) return jsonResponse({ ok: true });
+      sendCount += 1;
+      if (sendCount === 1) return jsonResponse({ error: true }, 500);
+      return jsonResponse({ results: [{ token: 'token100', ok: false, drop: true }] });
+    });
+    vi.stubGlobal('fetch', fetchMock);
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    const runtime = createApnsRuntime(makeDeps());
+    const tokens = Array.from({ length: 101 }, (_, i) => `token${String(i).padStart(3, '0')}`);
+    for (const [i, token] of tokens.entries()) {
+      await runtime.addOrUpdateApnsToken(`s${i}`, token);
+    }
+
+    try {
+      fetchMock.mockClear();
+      await runtime.sendApnsToAllUiSessions({ title: 't', body: 'b' });
+      const sendCalls = fetchMock.mock.calls.filter(([url]) => String(url).endsWith('/v1/push/send'));
+      expect(sendCalls).toHaveLength(2);
+      expect(sendCalls.map(([, init]) => JSON.parse(init.body).tokens).flat()).toHaveLength(101);
+
+      fetchMock.mockClear();
+      await runtime.sendApnsToAllUiSessions({ title: 't', body: 'b' });
+      const retryTokens = fetchMock.mock.calls
+        .filter(([url]) => String(url).endsWith('/v1/push/send'))
+        .flatMap(([, init]) => JSON.parse(init.body).tokens);
+      expect(retryTokens).not.toContain('token100');
+      expect(retryTokens).toHaveLength(100);
+    } finally {
+      warn.mockRestore();
+    }
+  });
+
+  it('sends localized scenario titles grouped by stored token locale', 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());
+    await runtime.addOrUpdateApnsToken('s1', 'tokenEn', undefined, 'ios', 'en');
+    await runtime.addOrUpdateApnsToken('s2', 'tokenZh', undefined, 'ios', 'zh-CN');
+    await runtime.addOrUpdateApnsToken('s3', 'tokenJa', undefined, 'android', 'ja');
+
+    fetchMock.mockClear();
+    await runtime.sendApnsToAllUiSessions({
+      type: 'ready',
+      sessionName: 'My session',
+      badge: 2,
+      tag: 'ready-x',
+      data: { sessionId: 'sess1' },
+    });
+
+    const sendBodies = fetchMock.mock.calls
+      .filter(isSend)
+      .map(([, init]) => JSON.parse(init.body));
+    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']);
+    for (const body of sendBodies) {
+      expect(body.body).toBe('My session');
+      expect(body.badge).toBe(2);
+      const sendMessage = `${body.ts}.${[...body.tokens].sort().join(',')}.${body.title}`;
+      expect(await verifyRelaySignature(body.publicKeyJwk, sendMessage, body.sig)).toBe(true);
+    }
+  });
+
+  it('defaults missing token locale to English titles', 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());
+    await runtime.addOrUpdateApnsToken('s1', 'tokenLegacy');
+
+    fetchMock.mockClear();
+    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.body).toBe('S');
+  });
 });