@openchambery/web 2.0.0-beta.1 → 2.0.0-beta.10

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 {
@@ -412,20 +482,36 @@ export const createNotificationTriggerRuntime = (deps) => {
         }
       }
     }
-    if ((payload.type === 'session.idle' || payload.type === 'session.error') && sessionId) {
-      const error = payload.properties?.error;
+    // Ticket 07: shutdown interrupt is not a completion terminal — no ready push.
+    if (payload.type === 'session.execution.interrupted') {
+      const reason = payload.properties?.reason ?? payload.data?.reason;
+      if (reason === 'shutdown') return;
+    }
+    // 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 }] } : {}),
           },
         },
@@ -487,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({
@@ -543,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;
       }
@@ -564,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 = '';
@@ -574,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 || {};
@@ -625,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;
@@ -646,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;
       }
@@ -686,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 = '';
@@ -698,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 || {};
@@ -766,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' });
   });
 });
 

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

@@ -1,5 +1,75 @@
+import { projectSessionMessageRecords } from '../session-turn-pages/session-message-projection.js';
 import { summarizeText as summarizeSharedText } from '../text/summarization.js';
 
+const trimmedText = (value) => (typeof value === 'string' && value.trim() ? value.trim() : '');
+
+const isSessionRecord = (value) => {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return false;
+  return typeof value.id === 'string'
+    || typeof value.sessionID === 'string'
+    || typeof value.title === 'string'
+    || typeof value.parentID === 'string'
+    || (value.metadata && typeof value.metadata === 'object');
+};
+
+/**
+ * OpenCode 2 `GET /api/session/:id` returns `{ data: Session }`.
+ * Legacy responses and tests still return the session object itself.
+ * @param {unknown} payload
+ * @returns {object | null}
+ */
+export const readNotificationSessionRecord = (payload) => {
+  if (!payload || typeof payload !== 'object' || Array.isArray(payload)) return null;
+  if (isSessionRecord(payload.data)) return payload.data;
+  return isSessionRecord(payload) ? payload : null;
+};
+
+const TITLE_EVENT_TYPES = new Set(['session.created', 'session.updated', 'session.renamed']);
+
+/**
+ * Title carried by a session lifecycle event.
+ * v2 puts it on `data.title` (`session.created` / `session.renamed`).
+ * Legacy events put it on `properties.info.title`.
+ * @param {object | null | undefined} payload
+ * @returns {{ sessionId: string, title: string } | null}
+ */
+export const readSessionTitleFromEvent = (payload) => {
+  if (!payload || typeof payload !== 'object' || !TITLE_EVENT_TYPES.has(payload.type)) return null;
+  const bodies = [payload.properties, payload.data].filter((body) => body && typeof body === 'object' && !Array.isArray(body));
+  for (const body of bodies) {
+    const info = body.info && typeof body.info === 'object' ? body.info : null;
+    const title = trimmedText(info?.title) || trimmedText(body.title);
+    const sessionId = trimmedText(info?.id)
+      || trimmedText(info?.sessionID)
+      || trimmedText(body.sessionID)
+      || trimmedText(body.id);
+    if (title && sessionId) return { sessionId, title };
+  }
+  return null;
+};
+
+const readNotificationDirectory = (payload) => {
+  const properties = payload?.properties && typeof payload.properties === 'object' ? payload.properties : {};
+  const data = payload?.data && typeof payload.data === 'object' && !Array.isArray(payload.data) ? payload.data : {};
+  const info = properties.info && typeof properties.info === 'object' ? properties.info : {};
+  const dataInfo = data.info && typeof data.info === 'object' ? data.info : {};
+  const candidates = [
+    properties.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 '';
+};
+
 export const createNotificationTemplateRuntime = (deps) => {
   const {
     readSettingsFromDisk,
@@ -133,37 +203,45 @@ export const createNotificationTemplateRuntime = (deps) => {
     return '';
   };
 
-  const fetchLastAssistantMessageText = async (sessionId, messageId, maxLength = NOTIFICATION_BODY_MAX_CHARS) => {
+  const fetchLastAssistantMessageText = async (sessionId, messageId, maxLength = NOTIFICATION_BODY_MAX_CHARS, directory) => {
     if (!sessionId) return '';
 
     try {
-      const url = buildOpenCodeUrl(`/session/${encodeURIComponent(sessionId)}/message`, '');
-      const response = await fetch(`${url}?limit=5`, {
+      const base = buildOpenCodeUrl(`/session/${encodeURIComponent(sessionId)}/message`, '');
+      const params = new URLSearchParams({ limit: '5', order: 'desc' });
+      const scopedDirectory = trimmedText(directory);
+      if (scopedDirectory) params.set('directory', scopedDirectory);
+      const response = await fetch(`${base}?${params.toString()}`, {
         method: 'GET',
         headers: {
           Accept: 'application/json',
-          ...getOpenCodeAuthHeaders(),
+          ...(typeof getOpenCodeAuthHeaders === 'function' ? getOpenCodeAuthHeaders() : {}),
         },
         signal: AbortSignal.timeout(3000),
       });
 
       if (!response.ok) return '';
 
-      const messages = await response.json().catch(() => null);
-      if (!Array.isArray(messages)) return '';
+      const payload = await response.json().catch(() => null);
+      // Legacy lists are a chronological array. OpenCode 2 returns `{ data }`
+      // and `order=desc` puts the newest turn first.
+      const newestFirst = !Array.isArray(payload);
+      const records = Array.isArray(payload)
+        ? payload
+        : (Array.isArray(payload?.data) ? payload.data : null);
+      if (!records) return '';
+      const projected = projectSessionMessageRecords(records);
+      const messages = newestFirst ? projected : [...projected].reverse();
 
       let target = null;
       if (messageId) {
         target = messages.find((message) => message?.info?.id === messageId && message?.info?.role === 'assistant');
       }
       if (!target) {
-        for (let i = messages.length - 1; i >= 0; i -= 1) {
-          const message = messages[i];
-          if (message?.info?.role === 'assistant' && message?.info?.finish === 'stop') {
-            target = message;
-            break;
-          }
-        }
+        target = messages.find((message) => (
+          message?.info?.role === 'assistant'
+          && extractTextFromParts(message.parts, maxLength).length > 0
+        ));
       }
 
       if (!target || !Array.isArray(target.parts)) return '';
@@ -175,9 +253,9 @@ export const createNotificationTemplateRuntime = (deps) => {
   };
 
   const cacheSessionTitle = (sessionId, title) => {
-    if (typeof sessionId === 'string' && sessionId.length > 0 && typeof title === 'string' && title.length > 0) {
-      sessionTitleCache.set(sessionId, title);
-    }
+    const id = trimmedText(sessionId);
+    const name = trimmedText(title);
+    if (id && name) sessionTitleCache.set(id, name);
   };
 
   const getCachedSessionTitle = (sessionId) => {
@@ -185,15 +263,12 @@ export const createNotificationTemplateRuntime = (deps) => {
   };
 
   const maybeCacheSessionInfoFromEvent = (payload) => {
-    if (!payload || typeof payload !== 'object') return;
-    const type = payload.type;
-    if (type !== 'session.updated' && type !== 'session.created') return;
-    const info = payload.properties?.info;
-    if (!info || typeof info !== 'object') return;
-    cacheSessionTitle(info.id, info.title);
+    const titled = readSessionTitleFromEvent(payload);
+    if (!titled) return;
+    cacheSessionTitle(titled.sessionId, titled.title);
   };
 
-  const fetchSessionInfo = async (sessionId) => {
+  const fetchSessionInfo = async (sessionId, directory) => {
     if (!sessionId) return null;
 
     const cached = sessionInfoCache.get(sessionId);
@@ -202,20 +277,24 @@ export const createNotificationTemplateRuntime = (deps) => {
     }
 
     try {
-      const url = buildOpenCodeUrl(`/session/${encodeURIComponent(sessionId)}`, '');
+      const base = buildOpenCodeUrl(`/session/${encodeURIComponent(sessionId)}`, '');
+      const url = directory ? `${base}?directory=${encodeURIComponent(directory)}` : base;
       const response = await fetch(url, {
         method: 'GET',
-        headers: { Accept: 'application/json' },
+        headers: {
+          Accept: 'application/json',
+          ...(typeof getOpenCodeAuthHeaders === 'function' ? getOpenCodeAuthHeaders() : {}),
+        },
         signal: AbortSignal.timeout(2000),
       });
       if (!response.ok) {
         console.warn(`[Notification] fetchSessionInfo: ${response.status} for session ${sessionId}`);
         return null;
       }
-      const data = await response.json().catch(() => null);
-      if (data && typeof data === 'object') {
-        sessionInfoCache.set(sessionId, { data, at: Date.now() });
-        return data;
+      const session = readNotificationSessionRecord(await response.json().catch(() => null));
+      if (session) {
+        sessionInfoCache.set(sessionId, { data: session, at: Date.now() });
+        return session;
       }
       return null;
     } catch (error) {
@@ -227,7 +306,11 @@ export const createNotificationTemplateRuntime = (deps) => {
   const buildTemplateVariables = async (payload, sessionId) => {
     const info = payload?.properties?.info || {};
 
-    let sessionTitle = payload?.properties?.sessionTitle || payload?.properties?.session?.title || (typeof info.sessionTitle === 'string' ? info.sessionTitle : '') || '';
+    const fromEvent = readSessionTitleFromEvent(payload);
+    let sessionTitle = trimmedText(payload?.properties?.sessionTitle)
+      || trimmedText(payload?.properties?.session?.title)
+      || trimmedText(info.sessionTitle)
+      || (fromEvent && (!sessionId || fromEvent.sessionId === sessionId) ? fromEvent.title : '');
 
     if (!sessionTitle && sessionId) {
       const cached = getCachedSessionTitle(sessionId);
@@ -238,25 +321,34 @@ export const createNotificationTemplateRuntime = (deps) => {
 
     let sessionInfo = null;
     if (!sessionTitle && sessionId) {
-      sessionInfo = await fetchSessionInfo(sessionId);
-      if (sessionInfo && typeof sessionInfo.title === 'string') {
-        sessionTitle = sessionInfo.title;
+      sessionInfo = await fetchSessionInfo(sessionId, readNotificationDirectory(payload));
+      const fetchedTitle = trimmedText(sessionInfo?.title);
+      if (fetchedTitle) {
+        sessionTitle = fetchedTitle;
         cacheSessionTitle(sessionId, sessionTitle);
       }
     }
 
+    const eventAgent = trimmedText(info.agent) || trimmedText(info.mode);
+    const eventModel = trimmedText(info.modelID)
+      || trimmedText(info.model?.modelID)
+      || trimmedText(info.model?.id);
+    if ((!eventAgent || !eventModel) && sessionId && !sessionInfo) {
+      sessionInfo = await fetchSessionInfo(sessionId, readNotificationDirectory(payload));
+    }
+
     const agentName = (() => {
-      const mode = typeof info.agent === 'string' && info.agent.trim().length > 0
-        ? info.agent.trim()
-        : (typeof info.mode === 'string' ? info.mode.trim() : '');
+      const mode = eventAgent || trimmedText(sessionInfo?.agent) || trimmedText(sessionInfo?.mode);
       if (!mode) return 'Agent';
       return mode.split(/[-_\s]+/).filter(Boolean)
         .map((token) => token.charAt(0).toUpperCase() + token.slice(1)).join(' ');
     })();
 
     const modelName = (() => {
-      const raw = typeof info.modelID === 'string' ? info.modelID.trim()
-        : (typeof info.model?.modelID === 'string' ? info.model.modelID.trim() : '');
+      const raw = eventModel
+        || trimmedText(sessionInfo?.model?.modelID)
+        || trimmedText(sessionInfo?.model?.id)
+        || trimmedText(sessionInfo?.modelID);
       if (!raw) return 'Assistant';
       return raw.split(/[-_]+/).filter(Boolean)
         .map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(' ');