@openchambery/web 2.0.0-beta.3 → 2.0.0-beta.5

package/server/lib/event-stream/reasoning-projection.test.js

@@ -13,6 +13,21 @@ import {
 } from './reasoning-projection.js';
 
 describe('shouldIncludeReasoning / query helpers', () => {
+  it('projects v2 list/context and exact snapshots without dropping rows or cursor', () => {
+    const row = { id: 'm', type: 'assistant', tokens: { reasoning: 12 }, content: [
+      { type: 'reasoning', text: 'hidden' }, { type: 'text', text: 'visible' },
+    ] };
+    const payload = { data: [row], cursor: { next: 'older' } };
+    const projected = projectMessagesPayloadForReasoning(payload, false);
+    expect(projected).toEqual({ data: [{ ...row, content: [row.content[1]] }], cursor: payload.cursor });
+    expect(projectMessagesPayloadForReasoning(row, false)).toEqual(projected.data[0]);
+    expect(projectMessagesPayloadForReasoning(payload, true)).toBe(payload);
+    expect(row.content).toHaveLength(2);
+    const filter = createReasoningOutboundFilter();
+    expect(filter.projectEvent({ type: 'session.reasoning.delta.1', data: { delta: 'hidden' } })).toBeNull();
+    const text = { type: 'session.text.delta', data: { delta: 'visible' } };
+    expect(filter.projectEvent(text)).toBe(text);
+  });
   it('only treats the strict string false as disabled', () => {
     expect(shouldIncludeReasoning(undefined)).toBe(true);
     expect(shouldIncludeReasoning(null)).toBe(true);

package/server/lib/notifications/DOCUMENTATION.md

@@ -107,7 +107,9 @@ This module provides notification message preparation utilities for the web serv
   - `extractLastMessageText(payload, maxLength?)`
   - `fetchLastAssistantMessageText(sessionId, messageId, maxLength?)`
   - `maybeCacheSessionInfoFromEvent(payload)`
-  - `buildTemplateVariables(payload, sessionId)`
+  - `buildTemplateVariables(payload, sessionId)` — `session_name` is the session title. OpenCode 2 returns that title on `GET /api/session/:id` as `{ data: { title } }` and on `session.created` / `session.renamed` as `data.title`. Legacy `properties.info.title` still counts. An empty title stays empty so push can fall back to the localized "Session" label. `agent_name` / `model_name` fall back to that same session record when the triggering event has none. `fetchLastAssistantMessageText` accepts a legacy message array and an OpenCode 2 `{ data }` page (`order=desc`).
+- Question prompts come from legacy `question.asked` or OpenCode 2 `form.created` (`data.form`). Permission prompts read `permission.asked` from `properties` or `data` (`action`, `message`, `id`). `form.replied` / `form.cancelled` cancel a pending question notification the same way `permission.replied` cancels a permission notification.
+- iOS APNs and Android FCM share this payload: native banners stay scenario title + session name. Desktop, in-app, and web-push use the resolved template title and body.
   - `getCachedZenModels()`
 
 ## Constants

package/server/lib/notifications/runtime.js

@@ -1,3 +1,41 @@
+import { readNotificationSessionRecord } from './template-runtime.js';
+
+const trimmedText = (value) => (typeof value === 'string' && value.trim() ? value.trim() : '');
+
+const readNotificationEventFields = (payload) => {
+  const properties = payload?.properties && typeof payload.properties === 'object' && !Array.isArray(payload.properties)
+    ? payload.properties
+    : {};
+  const data = payload?.data && typeof payload.data === 'object' && !Array.isArray(payload.data)
+    ? payload.data
+    : {};
+  const form = (properties.form && typeof properties.form === 'object' ? properties.form : null)
+    || (data.form && typeof data.form === 'object' ? data.form : null);
+  const questions = Array.isArray(properties.questions)
+    ? properties.questions
+    : (Array.isArray(data.questions) ? data.questions : []);
+  const firstQuestion = questions[0] && typeof questions[0] === 'object' ? questions[0] : null;
+  const field = Array.isArray(form?.fields)
+    ? form.fields.find((item) => item && typeof item === 'object' && item.hidden !== true)
+    : null;
+  return {
+    requestId: trimmedText(properties.id)
+      || trimmedText(properties.requestID)
+      || trimmedText(properties.requestId)
+      || trimmedText(data.id)
+      || trimmedText(data.requestID)
+      || trimmedText(data.requestId)
+      || trimmedText(form?.id),
+    permission: trimmedText(properties.permission) || trimmedText(data.permission) || trimmedText(data.action),
+    message: trimmedText(data.message) || trimmedText(properties.message),
+    header: trimmedText(firstQuestion?.header) || trimmedText(field?.title) || trimmedText(form?.title),
+    questionText: trimmedText(firstQuestion?.question)
+      || trimmedText(field?.description)
+      || trimmedText(field?.title)
+      || trimmedText(form?.title),
+  };
+};
+
 export const createNotificationTriggerRuntime = (deps) => {
   const {
     readSettingsFromDisk,
@@ -255,14 +293,14 @@ export const createNotificationTriggerRuntime = (deps) => {
       if (!response.ok) {
         return cached;
       }
-      const session = await response.json().catch(() => null);
-      if (!session || typeof session !== 'object') {
+      const session = readNotificationSessionRecord(await response.json().catch(() => null));
+      if (!session) {
         return cached;
       }
 
       const meta = {
         parentID: normalizeParentID(session.parentID),
-        title: typeof session.title === 'string' ? session.title : null,
+        title: trimmedText(session.title) || null,
         complete: true,
         ...metaFromOpenchamber(session.metadata?.openchamber),
       };
@@ -346,13 +384,24 @@ export const createNotificationTriggerRuntime = (deps) => {
 
   const extractSessionIdFromPayload = (payload) => {
     if (!payload || typeof payload !== 'object') return null;
-    const props = payload.properties;
+    const props = payload.properties && typeof payload.properties === 'object'
+      ? payload.properties
+      : (payload.data && typeof payload.data === 'object' ? payload.data : null);
     const info = props?.info;
+    const data = payload.data && typeof payload.data === 'object' && !Array.isArray(payload.data)
+      ? payload.data
+      : null;
     const sessionId =
       info?.sessionID ??
       info?.sessionId ??
       props?.sessionID ??
       props?.sessionId ??
+      props?.form?.sessionID ??
+      props?.form?.sessionId ??
+      data?.sessionID ??
+      data?.sessionId ??
+      data?.form?.sessionID ??
+      data?.form?.sessionId ??
       props?.session ??
       null;
     return typeof sessionId === 'string' && sessionId.length > 0 ? sessionId : null;
@@ -360,11 +409,32 @@ export const createNotificationTriggerRuntime = (deps) => {
 
   const extractDirectoryFromPayload = (payload) => {
     if (!payload || typeof payload !== 'object') return undefined;
-    const props = payload.properties;
-    const directory = props?.directory ?? props?.info?.directory;
-    if (typeof directory !== 'string') return undefined;
-    const trimmed = directory.trim();
-    return trimmed.length > 0 ? trimmed : undefined;
+    const props = payload.properties && typeof payload.properties === 'object' ? payload.properties : {};
+    const data = payload.data && typeof payload.data === 'object' && !Array.isArray(payload.data) ? payload.data : {};
+    const info = props.info && typeof props.info === 'object' ? props.info : {};
+    const dataInfo = data.info && typeof data.info === 'object' ? data.info : {};
+    const candidates = [
+      props.directory,
+      info.directory,
+      info.location?.directory,
+      payload.location?.directory,
+      data.directory,
+      data.location?.directory,
+      dataInfo.directory,
+      dataInfo.location?.directory,
+    ];
+    for (const value of candidates) {
+      const directory = trimmedText(value);
+      if (directory) return directory;
+    }
+    return undefined;
+  };
+
+  const resolvePushSessionName = async (variables, sessionId, directory) => {
+    const fromTemplate = trimmedText(variables?.session_name);
+    if (fromTemplate) return fromTemplate;
+    const meta = await fetchSessionMeta(sessionId, directory);
+    return trimmedText(meta?.title);
   };
 
   // A session with an ACTIVE goal suppresses per-turn ready notifications;
@@ -381,7 +451,7 @@ export const createNotificationTriggerRuntime = (deps) => {
         signal: AbortSignal.timeout(2000),
       });
       if (!response.ok) return false;
-      const session = await response.json().catch(() => null);
+      const session = readNotificationSessionRecord(await response.json().catch(() => null));
       const goal = session?.metadata?.openchamber?.goal;
       return Boolean(goal && typeof goal === 'object' && goal.status === 'active');
     } catch {
@@ -417,20 +487,31 @@ export const createNotificationTriggerRuntime = (deps) => {
       const reason = payload.properties?.reason ?? payload.data?.reason;
       if (reason === 'shutdown') return;
     }
-    if ((payload.type === 'session.idle' || payload.type === 'session.error') && sessionId) {
-      const error = payload.properties?.error;
+    // v2 completion is session.execution.succeeded. session.idle is a deprecated
+    // fallback; the ready-notification cooldown below collapses the pair.
+    if ((
+      payload.type === 'session.idle'
+      || payload.type === 'session.execution.succeeded'
+      || payload.type === 'session.error'
+      || payload.type === 'session.execution.failed'
+    ) && sessionId) {
+      const body = payload.properties && typeof payload.properties === 'object'
+        ? payload.properties
+        : (payload.data && typeof payload.data === 'object' ? payload.data : {});
+      const error = body?.error;
       const errorText = typeof error?.message === 'string'
         ? error.message
         : typeof error === 'string' ? error : '';
+      const failed = payload.type === 'session.error' || payload.type === 'session.execution.failed';
       await maybeSendPushForTrigger({
         ...payload,
         type: 'message.updated',
         properties: {
-          ...payload.properties,
+          ...(payload.properties && typeof payload.properties === 'object' ? payload.properties : body),
           info: {
             sessionID: sessionId,
             role: 'assistant',
-            finish: payload.type === 'session.error' ? 'error' : 'stop',
+            finish: failed ? 'error' : 'stop',
             ...(errorText ? { parts: [{ type: 'text', text: errorText }] } : {}),
           },
         },
@@ -492,12 +573,12 @@ export const createNotificationTriggerRuntime = (deps) => {
           const completionTemplate = templates.completion || { title: 'Task completed', message: '{session_name}' };
 
           const variables = await buildTemplateVariables(payload, sessionId);
-          sessionName = typeof variables.session_name === 'string' ? variables.session_name : sessionName;
+          sessionName = await resolvePushSessionName(variables, sessionId, notificationDirectory);
 
           const messageId = info?.id;
           let lastMessage = extractLastMessageText(payload);
           if (!lastMessage) {
-            lastMessage = await fetchLastAssistantMessageText(sessionId, messageId);
+            lastMessage = await fetchLastAssistantMessageText(sessionId, messageId, undefined, notificationDirectory);
           }
 
           variables.last_message = await prepareNotificationLastMessage({
@@ -548,7 +629,21 @@ export const createNotificationTriggerRuntime = (deps) => {
       return;
     }
 
-    if (payload.type === 'question.asked' && sessionId) {
+    if ((
+      payload.type === 'form.replied'
+      || payload.type === 'form.cancelled'
+      || payload.type === 'question.replied'
+      || payload.type === 'question.rejected'
+    ) && sessionId) {
+      const existingTimer = pushQuestionDebounceTimers.get(sessionId);
+      if (existingTimer) {
+        clearTimeout(existingTimer);
+        pushQuestionDebounceTimers.delete(sessionId);
+      }
+      return;
+    }
+
+    if ((payload.type === 'question.asked' || payload.type === 'form.created') && sessionId) {
       if (await shouldSkipSystemSessionNotification(sessionId, notificationDirectory)) {
         return;
       }
@@ -569,9 +664,9 @@ export const createNotificationTriggerRuntime = (deps) => {
           return;
         }
 
-        const firstQuestion = payload.properties?.questions?.[0];
-        const header = typeof firstQuestion?.header === 'string' ? firstQuestion.header.trim() : '';
-        const questionText = typeof firstQuestion?.question === 'string' ? firstQuestion.question.trim() : '';
+        const prompt = readNotificationEventFields(payload);
+        const header = prompt.header;
+        const questionText = prompt.questionText;
 
         let title = 'Needs your answer';
         let body = '';
@@ -579,7 +674,7 @@ export const createNotificationTriggerRuntime = (deps) => {
 
         try {
           const variables = await buildTemplateVariables(payload, sessionId);
-          sessionName = typeof variables.session_name === 'string' ? variables.session_name : sessionName;
+          sessionName = await resolvePushSessionName(variables, sessionId, notificationDirectory);
           variables.last_message = questionText || header || '';
 
           const templates = settings.notificationTemplates || {};
@@ -630,8 +725,8 @@ export const createNotificationTriggerRuntime = (deps) => {
     }
 
     if (payload.type === 'permission.replied' && sessionId) {
-      const requestId = payload.properties?.requestID ?? payload.properties?.requestId ?? payload.properties?.id;
-      const requestKey = typeof requestId === 'string' ? `${sessionId}:${requestId}` : null;
+      const requestId = readNotificationEventFields(payload).requestId;
+      const requestKey = requestId ? `${sessionId}:${requestId}` : null;
       const pendingNotification = pushPermissionDebounceTimers.get(sessionId);
       if (!pendingNotification) {
         return;
@@ -651,9 +746,10 @@ export const createNotificationTriggerRuntime = (deps) => {
       if (await shouldSkipSystemSessionNotification(sessionId, notificationDirectory)) {
         return;
       }
-      const requestId = payload.properties?.id ?? payload.properties?.requestID ?? payload.properties?.requestId;
-      const permission = payload.properties?.permission;
-      const requestKey = typeof requestId === 'string' ? `${sessionId}:${requestId}` : null;
+      const permissionFields = readNotificationEventFields(payload);
+      const requestId = permissionFields.requestId;
+      const permission = permissionFields.permission;
+      const requestKey = requestId ? `${sessionId}:${requestId}` : null;
       if (requestKey && notifiedPermissionRequests.has(requestKey)) {
         return;
       }
@@ -691,11 +787,12 @@ export const createNotificationTriggerRuntime = (deps) => {
           return;
         }
 
-        const sessionTitle = payload.properties?.sessionTitle;
+        const sessionTitle = payload.properties?.sessionTitle ?? payload.data?.sessionTitle;
         const permissionText = typeof permission === 'string' && permission.length > 0 ? permission : '';
+        const detail = permissionFields.message;
         const fallbackMessage = typeof sessionTitle === 'string' && sessionTitle.trim().length > 0
           ? sessionTitle.trim()
-          : permissionText || 'Agent is waiting for your approval';
+          : detail || permissionText || 'Agent is waiting for your approval';
 
         let title = 'Needs permission';
         let body = '';
@@ -703,7 +800,7 @@ export const createNotificationTriggerRuntime = (deps) => {
 
         try {
           const variables = await buildTemplateVariables(payload, sessionId);
-          sessionName = typeof variables.session_name === 'string' ? variables.session_name : sessionName;
+          sessionName = await resolvePushSessionName(variables, sessionId, notificationDirectory);
           variables.last_message = fallbackMessage;
 
           const templates = settings.notificationTemplates || {};
@@ -771,8 +868,8 @@ export const createNotificationTriggerRuntime = (deps) => {
         signal: AbortSignal.timeout(2000),
       });
       if (response.ok) {
-        const session = await response.json().catch(() => null);
-        if (typeof session?.title === 'string') sessionName = session.title.trim();
+        const session = readNotificationSessionRecord(await response.json().catch(() => null));
+        sessionName = trimmedText(session?.title);
       }
     } catch {
       // Session name is presentation sugar for the mobile push — never block on it.

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

@@ -457,6 +457,17 @@ describe('contact turn notifications', () => {
 });
 
 describe('notification trigger live activity end', () => {
+  it('treats session.execution.succeeded as completion, including a v2 data envelope', async () => {
+    vi.stubGlobal('fetch', vi.fn(async () => rootSessionResponse('ses_done')));
+    const { runtime, sendLiveActivityEnd, emitDesktopNotification } = createRuntime();
+    await runtime.maybeSendPushForTrigger({
+      type: 'session.execution.succeeded',
+      data: { sessionID: 'ses_done' },
+    });
+    expect(sendLiveActivityEnd).toHaveBeenCalledWith({ sessionId: 'ses_done', status: 'complete' });
+    expect(emitDesktopNotification).toHaveBeenCalled();
+  });
+
   it('ends the live activity on top-level completion and error', async () => {
     vi.stubGlobal('fetch', vi.fn(async () => rootSessionResponse()));
     const { runtime, sendLiveActivityEnd } = createRuntime();
@@ -615,6 +626,97 @@ describe('notification event toggles', () => {
     expect(sendPushToAllUiSessions).not.toHaveBeenCalled();
   });
 
+  it('notifies on an OpenCode 2 question form and a permission request', async () => {
+    vi.useFakeTimers();
+    vi.stubGlobal('fetch', vi.fn(async () => jsonResponse({
+      data: { id: 'ses_ask', parentID: null, title: '发布说明', metadata: {} },
+    })));
+    const resolveNotificationTemplate = vi.fn((template, variables) => (
+      typeof template === 'string'
+        ? template.replace(/\{(\w+)\}/g, (_match, key) => variables?.[key] ?? '')
+        : template
+    ));
+    const { runtime, emitDesktopNotification, sendApnsToAllUiSessions } = createRuntime({
+      buildTemplateVariables: vi.fn(async () => ({ session_name: '' })),
+      resolveNotificationTemplate,
+      readSettingsFromDisk: vi.fn(async () => ({
+        ...defaultSettings,
+        notificationTemplates: {
+          question: { title: 'Needs your answer', message: '{last_message}' },
+        },
+      })),
+    });
+
+    await runtime.maybeSendPushForTrigger({
+      type: 'form.created',
+      data: {
+        form: {
+          id: 'frm_1',
+          sessionID: 'ses_ask',
+          title: 'Questions',
+          metadata: { kind: 'question' },
+          fields: [{ key: 'q0', title: '确认入口', description: '从哪个入口触发？' }],
+        },
+      },
+    });
+    await vi.runAllTimersAsync();
+
+    expect(emitDesktopNotification).toHaveBeenCalledWith(expect.objectContaining({
+      kind: 'question',
+      body: '从哪个入口触发？',
+    }));
+    expect(sendApnsToAllUiSessions).toHaveBeenCalledWith(
+      expect.objectContaining({ type: 'question', sessionName: '发布说明' }),
+      { requireNoSse: true },
+    );
+
+    emitDesktopNotification.mockClear();
+    sendApnsToAllUiSessions.mockClear();
+    await runtime.maybeSendPushForTrigger({
+      type: 'permission.asked',
+      data: {
+        id: 'per_1',
+        sessionID: 'ses_ask',
+        action: 'edit',
+        message: '修改 README',
+        resources: ['README.md'],
+      },
+    });
+    await vi.runAllTimersAsync();
+
+    expect(emitDesktopNotification).toHaveBeenCalledWith(expect.objectContaining({
+      kind: 'permission',
+      body: '修改 README',
+    }));
+    expect(sendApnsToAllUiSessions).toHaveBeenCalledWith(
+      expect.objectContaining({ type: 'permission', sessionName: '发布说明' }),
+      { requireNoSse: true },
+    );
+  });
+
+  it('uses the wrapped OpenCode 2 session title when the template has none', async () => {
+    vi.stubGlobal('fetch', vi.fn(async () => jsonResponse({
+      data: {
+        id: 'ses_done',
+        parentID: null,
+        title: '发布说明',
+        metadata: {},
+      },
+    })));
+    const { runtime, sendApnsToAllUiSessions } = createRuntime({
+      buildTemplateVariables: vi.fn(async () => ({ session_name: '' })),
+    });
+    await runtime.maybeSendPushForTrigger({
+      type: 'session.execution.succeeded',
+      location: { directory: '/repo' },
+      data: { sessionID: 'ses_done' },
+    });
+    expect(sendApnsToAllUiSessions).toHaveBeenCalledWith(
+      expect.objectContaining({ type: 'ready', sessionName: '发布说明' }),
+      { requireNoSse: true },
+    );
+  });
+
   it('still sends goal settle push by default', async () => {
     vi.stubGlobal('fetch', vi.fn(async () => jsonResponse({ id: 'ses_goal', title: 'Goal run' })));
     const { runtime, sendPushToAllUiSessions } = createRuntime();
@@ -626,6 +728,7 @@ describe('notification event toggles', () => {
     });
     expect(sendPushToAllUiSessions).toHaveBeenCalledTimes(1);
     expect(sendPushToAllUiSessions.mock.calls[0][0]).toMatchObject({ tag: 'goal-ses_goal' });
+    expect(sendPushToAllUiSessions.mock.calls[0][0].data).toMatchObject({ sessionName: 'Goal run' });
   });
 });