@openchambery/web 1.19.7-beta.2 → 1.19.7-beta.21

package/server/lib/notifications/runtime.js

@@ -47,9 +47,20 @@ export const createNotificationTriggerRuntime = (deps) => {
     return pendingPushTags.size;
   };
 
+  const stringifyApnsData = (data) => {
+    if (!data || typeof data !== 'object') return undefined;
+    const next = {};
+    for (const [key, value] of Object.entries(data)) {
+      if (typeof value !== 'string' || value.length === 0) continue;
+      next[key] = value;
+    }
+    return Object.keys(next).length > 0 ? next : undefined;
+  };
+
   // Generic notification for native push (per the mobile design): a fixed, scenario-based
   // title + the session name as the body. No model/project/message content crosses the relay.
   // Title strings are localized per device token locale inside sendApnsToAllUiSessions.
+  // Contact turns opt out via preserveAlert — those keep nickname + spoken text.
   const toApnsGenericPayload = (payload) => {
     const data = payload?.data && typeof payload.data === 'object' ? payload.data : {};
     const sessionName = typeof data.sessionName === 'string' && data.sessionName.trim().length > 0
@@ -66,15 +77,39 @@ export const createNotificationTriggerRuntime = (deps) => {
     };
   };
 
+  const toApnsContactPayload = (payload) => {
+    const data = payload?.data && typeof payload.data === 'object' ? payload.data : {};
+    const title = typeof payload?.title === 'string' && payload.title.trim()
+      ? payload.title.trim()
+      : 'Assistant';
+    const body = typeof payload?.body === 'string' ? payload.body : '';
+    return {
+      title,
+      body,
+      badge: trackPushAndCountBadge(typeof payload?.tag === 'string' ? payload.tag : undefined),
+      tag: payload?.tag,
+      data: stringifyApnsData({
+        assistantID: data.assistantID,
+        url: typeof data.assistantID === 'string' && data.assistantID.trim()
+          ? `openchamber://assistant/${encodeURIComponent(data.assistantID.trim())}`
+          : (typeof data.url === 'string' ? data.url : undefined),
+      }),
+    };
+  };
+
   // Fan a notification out to every delivery channel: browser web-push (full templated
-  // payload) and native iOS APNs (generic model-based text). Both share the dedup tag;
-  // a failure in one channel must not block the other. Visibility on any other client
-  // never suppresses delivery — every subscribed surface gets the push.
-  const fanoutPush = (payload, options) => Promise.all([
+  // payload) and native iOS APNs (generic model-based text, unless preserveAlert).
+  // Both share the dedup tag; a failure in one channel must not block the other.
+  // Visibility on any other client never suppresses delivery — every subscribed
+  // surface gets the push.
+  const fanoutPush = (payload, options = {}) => Promise.all([
     Promise.resolve(sendPushToAllUiSessions?.(payload, options)).catch((error) => {
       console.warn('[Push] web-push fanout failed:', error?.message ?? error);
     }),
-    Promise.resolve(sendApnsToAllUiSessions?.(toApnsGenericPayload(payload), options)).catch((error) => {
+    Promise.resolve(sendApnsToAllUiSessions?.(
+      options.preserveAlert === true ? toApnsContactPayload(payload) : toApnsGenericPayload(payload),
+      options,
+    )).catch((error) => {
       console.warn('[APNs] fanout failed:', error?.message ?? error);
     }),
   ]);
@@ -97,6 +132,8 @@ export const createNotificationTriggerRuntime = (deps) => {
 
   const sessionMetaCache = new Map();
   const SESSION_META_CACHE_TTL_MS = 60 * 1000;
+  const HIDDEN_SESSION_TITLES = new Set(['smartfetch-secondary']);
+  const nonEmptySystemID = (value) => typeof value === 'string' && value.length > 0;
 
   // Sessions where the client has enabled Permission Auto-Accept. Mirrored
   // from the client-side permissionStore via POST /api/notifications/auto-accept
@@ -148,32 +185,47 @@ export const createNotificationTriggerRuntime = (deps) => {
       smallModelPurpose: meta.smallModelPurpose !== undefined
         ? meta.smallModelPurpose
         : (previous?.smallModelPurpose ?? null),
+      assistantID: meta.assistantID !== undefined ? meta.assistantID : (previous?.assistantID ?? null),
+      assignedFrom: meta.assignedFrom !== undefined ? meta.assignedFrom : (previous?.assignedFrom ?? null),
+      scheduledTaskID: meta.scheduledTaskID !== undefined
+        ? meta.scheduledTaskID
+        : (previous?.scheduledTaskID ?? null),
+      title: meta.title !== undefined ? meta.title : (previous?.title ?? null),
+      complete: meta.complete === true || previous?.complete === true,
       at: Date.now(),
     });
   };
 
-  const getParentIdFromPayload = (payload) => {
-    if (!payload || typeof payload !== 'object') return undefined;
-    if (payload.type !== 'session.created' && payload.type !== 'session.updated') return undefined;
-    return normalizeParentID(payload.properties?.info?.parentID);
-  };
-
-  const getSmallModelPurposeFromPayload = (payload) => {
-    if (!payload || typeof payload !== 'object') return undefined;
-    if (payload.type !== 'session.created' && payload.type !== 'session.updated') return undefined;
-    return normalizeSmallModelPurpose(payload.properties?.info?.metadata?.openchamber?.smallModel?.purpose);
+  const metaFromOpenchamber = (openchamber, extras = {}) => {
+    const assignedFrom = typeof openchamber?.assigned?.from === 'string'
+      ? openchamber.assigned.from
+      : null;
+    return {
+      smallModelPurpose: normalizeSmallModelPurpose(openchamber?.smallModel?.purpose),
+      assistantID: nonEmptySystemID(openchamber?.assistant?.assistantID)
+        ? openchamber.assistant.assistantID
+        : null,
+      assignedFrom,
+      scheduledTaskID: nonEmptySystemID(openchamber?.scheduledTask?.taskID)
+        ? openchamber.scheduledTask.taskID
+        : null,
+      ...extras,
+    };
   };
 
   const maybeCacheSessionMetaFromPayload = (payload) => {
+    if (!payload || typeof payload !== 'object') return;
+    if (payload.type !== 'session.created' && payload.type !== 'session.updated') return;
+    const info = payload.properties?.info;
+    if (!info || typeof info !== 'object') return;
     const sessionId = extractSessionIdFromPayload(payload);
     if (typeof sessionId !== 'string' || sessionId.length === 0) return;
     const directory = extractDirectoryFromPayload(payload);
-    const parentID = getParentIdFromPayload(payload);
-    const smallModelPurpose = getSmallModelPurposeFromPayload(payload);
-    if (parentID === undefined && smallModelPurpose === undefined) return;
     setCachedSessionMeta(sessionId, directory, {
-      ...(parentID !== undefined ? { parentID } : {}),
-      ...(smallModelPurpose !== undefined ? { smallModelPurpose } : {}),
+      parentID: normalizeParentID(info.parentID),
+      title: typeof info.title === 'string' ? info.title : null,
+      complete: true,
+      ...metaFromOpenchamber(info.metadata?.openchamber),
     });
   };
 
@@ -181,7 +233,7 @@ export const createNotificationTriggerRuntime = (deps) => {
     if (!sessionId) return undefined;
 
     const cached = getCachedSessionMeta(sessionId, directory);
-    if (cached !== undefined) return cached;
+    if (cached?.complete) return cached;
 
     try {
       const base = buildOpenCodeUrl(`/session/${encodeURIComponent(sessionId)}`, '');
@@ -195,21 +247,23 @@ export const createNotificationTriggerRuntime = (deps) => {
         signal: AbortSignal.timeout(2000),
       });
       if (!response.ok) {
-        return undefined;
+        return cached;
       }
       const session = await response.json().catch(() => null);
       if (!session || typeof session !== 'object') {
-        return undefined;
+        return cached;
       }
 
       const meta = {
         parentID: normalizeParentID(session.parentID),
-        smallModelPurpose: normalizeSmallModelPurpose(session.metadata?.openchamber?.smallModel?.purpose),
+        title: typeof session.title === 'string' ? session.title : null,
+        complete: true,
+        ...metaFromOpenchamber(session.metadata?.openchamber),
       };
       setCachedSessionMeta(sessionId, directory, meta);
-      return meta;
+      return getCachedSessionMeta(sessionId, directory) ?? meta;
     } catch {
-      return undefined;
+      return cached;
     }
   };
 
@@ -234,20 +288,25 @@ export const createNotificationTriggerRuntime = (deps) => {
     return false;
   };
 
-  const isSubtaskSession = async (sessionId, directory) => {
-    const parentID = await fetchSessionParentId(sessionId, directory);
-    return typeof parentID === 'string' && parentID.length > 0;
-  };
-
-  const isSmallModelSession = async (sessionId, directory) => {
-    const meta = await fetchSessionMeta(sessionId, directory);
-    return typeof meta?.smallModelPurpose === 'string' && meta.smallModelPurpose.length > 0;
+  const isHiddenFromNavSession = (meta) => {
+    if (!meta) return false;
+    if (typeof meta.parentID === 'string' && meta.parentID.length > 0) return true;
+    if (typeof meta.smallModelPurpose === 'string' && meta.smallModelPurpose.length > 0) return true;
+    if (typeof meta.assistantID === 'string' && meta.assistantID.length > 0 && meta.assignedFrom !== 'contact') {
+      return true;
+    }
+    if (typeof meta.scheduledTaskID === 'string' && meta.scheduledTaskID.length > 0) return true;
+    if (typeof meta.title === 'string' && HIDDEN_SESSION_TITLES.has(meta.title)) return true;
+    return false;
   };
 
+  // Only sessions that can appear as sidebar roots get ordinary push. Child /
+  // subagent sessions, archived Assistant bindings, scheduled-task sessions,
+  // small-model system sessions, and SmartFetch secondaries are excluded.
+  // Contact-assigned worker sessions stay visible and still notify.
   const shouldSkipSystemSessionNotification = async (sessionId, directory) => {
-    if (await isSubtaskSession(sessionId, directory)) return true;
-    if (await isSmallModelSession(sessionId, directory)) return true;
-    return false;
+    const meta = await fetchSessionMeta(sessionId, directory);
+    return isHiddenFromNavSession(meta);
   };
 
   const extractSessionIdFromPayload = (payload) => {
@@ -273,40 +332,6 @@ export const createNotificationTriggerRuntime = (deps) => {
     return trimmed.length > 0 ? trimmed : undefined;
   };
 
-  const formatMode = (raw) => {
-    const value = typeof raw === 'string' ? raw.trim() : '';
-    const normalized = value.length > 0 ? value : 'agent';
-    return normalized
-      .split(/[-_\s]+/)
-      .filter(Boolean)
-      .map((token) => token.charAt(0).toUpperCase() + token.slice(1))
-      .join(' ');
-  };
-
-  const formatModelId = (raw) => {
-    const value = typeof raw === 'string' ? raw.trim() : '';
-    if (!value) {
-      return 'Assistant';
-    }
-
-    const tokens = value.split(/[-_]+/).filter(Boolean);
-    const result = [];
-    for (let i = 0; i < tokens.length; i += 1) {
-      const current = tokens[i];
-      const next = tokens[i + 1];
-      if (/^\d+$/.test(current) && next && /^\d+$/.test(next)) {
-        result.push(`${current}.${next}`);
-        i += 1;
-        continue;
-      }
-      result.push(current);
-    }
-
-    return result
-      .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
-      .join(' ');
-  };
-
   // A session with an ACTIVE goal suppresses per-turn ready notifications;
   // the session-goal runtime sends its own notification when the goal
   // settles. Fetch failures fall through to normal notification behavior.
@@ -338,6 +363,20 @@ export const createNotificationTriggerRuntime = (deps) => {
 
     const sessionId = extractSessionIdFromPayload(payload);
     const notificationDirectory = extractDirectoryFromPayload(payload);
+    if ((payload.type === 'session.updated' || payload.type === 'session.created') && sessionId) {
+      const title = payload.properties?.info?.title;
+      if (
+        typeof title === 'string'
+        && title.trim()
+        && !(await shouldSkipSystemSessionNotification(sessionId, notificationDirectory))
+      ) {
+        try {
+          await sendLiveActivityEnd?.({ sessionId, title: title.trim() });
+        } catch (error) {
+          console.warn('[Live Activity] title update failed:', error?.message ?? error);
+        }
+      }
+    }
     if ((payload.type === 'session.idle' || payload.type === 'session.error') && sessionId) {
       const error = payload.properties?.error;
       const errorText = typeof error?.message === 'string'
@@ -404,13 +443,13 @@ export const createNotificationTriggerRuntime = (deps) => {
         }
         lastReadyNotificationAt.set(sessionId, now);
 
-        let title = `${formatMode(info?.mode)} agent is ready`;
-        let body = `${formatModelId(info?.modelID)} completed the task`;
+        let title = 'Task completed';
+        let body = '';
         let sessionName = '';
 
         try {
           const templates = settings.notificationTemplates || {};
-          const completionTemplate = templates.completion || { title: '{agent_name} is ready', message: '{model_name} completed the task' };
+          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;
@@ -430,8 +469,10 @@ export const createNotificationTriggerRuntime = (deps) => {
           const resolvedBody = resolveNotificationTemplate(completionTemplate.message, variables);
           if (resolvedTitle) title = resolvedTitle;
           if (shouldApplyResolvedTemplateMessage(completionTemplate.message, resolvedBody, variables)) body = resolvedBody;
+          if (!body) body = sessionName || resolvedBody || 'Session';
         } catch (error) {
           console.warn('[Notification] Template resolution failed, using defaults:', error?.message || error);
+          if (!body) body = sessionName || 'Session';
         }
 
         if (settings.nativeNotificationsEnabled) {
@@ -492,12 +533,8 @@ export const createNotificationTriggerRuntime = (deps) => {
         const header = typeof firstQuestion?.header === 'string' ? firstQuestion.header.trim() : '';
         const questionText = typeof firstQuestion?.question === 'string' ? firstQuestion.question.trim() : '';
 
-        let title = /plan\s*mode/i.test(header)
-          ? 'Switch to plan mode'
-          : /build\s*agent/i.test(header)
-            ? 'Switch to build mode'
-            : header || 'Input needed';
-        let body = questionText || 'Agent is waiting for your response';
+        let title = 'Needs your answer';
+        let body = '';
         let sessionName = '';
 
         try {
@@ -506,14 +543,16 @@ export const createNotificationTriggerRuntime = (deps) => {
           variables.last_message = questionText || header || '';
 
           const templates = settings.notificationTemplates || {};
-          const questionTemplate = templates.question || { title: 'Input needed', message: '{last_message}' };
+          const questionTemplate = templates.question || { title: 'Needs your answer', message: '{session_name}' };
 
           const resolvedTitle = resolveNotificationTemplate(questionTemplate.title, variables);
           const resolvedBody = resolveNotificationTemplate(questionTemplate.message, variables);
           if (resolvedTitle) title = resolvedTitle;
           if (shouldApplyResolvedTemplateMessage(questionTemplate.message, resolvedBody, variables)) body = resolvedBody;
+          if (!body) body = sessionName || resolvedBody || 'Session';
         } catch (error) {
           console.warn('[Notification] Question template resolution failed, using defaults:', error?.message || error);
+          if (!body) body = sessionName || 'Session';
         }
 
         if (settings.nativeNotificationsEnabled) {
@@ -618,8 +657,8 @@ export const createNotificationTriggerRuntime = (deps) => {
           ? sessionTitle.trim()
           : permissionText || 'Agent is waiting for your approval';
 
-        let title = 'Permission required';
-        let body = fallbackMessage;
+        let title = 'Needs permission';
+        let body = '';
         let sessionName = '';
 
         try {
@@ -628,14 +667,14 @@ export const createNotificationTriggerRuntime = (deps) => {
           variables.last_message = fallbackMessage;
 
           const templates = settings.notificationTemplates || {};
-          const questionTemplate = templates.question || { title: 'Permission required', message: '{last_message}' };
+          const questionTemplate = templates.question || { title: 'Needs permission', message: '{session_name}' };
 
-          const resolvedTitle = resolveNotificationTemplate(questionTemplate.title, variables);
           const resolvedBody = resolveNotificationTemplate(questionTemplate.message, variables);
-          if (resolvedTitle) title = resolvedTitle;
           if (shouldApplyResolvedTemplateMessage(questionTemplate.message, resolvedBody, variables)) body = resolvedBody;
+          if (!body) body = sessionName || fallbackMessage || 'Session';
         } catch (error) {
           console.warn('[Notification] Permission template resolution failed, using defaults:', error?.message || error);
+          if (!body) body = sessionName || fallbackMessage || 'Session';
         }
 
         if (settings.nativeNotificationsEnabled) {
@@ -713,6 +752,57 @@ export const createNotificationTriggerRuntime = (deps) => {
     );
   };
 
+  const contactNotificationTitle = (name) => {
+    if (typeof name !== 'string' || !name.trim()) return 'Assistant';
+    const stripped = name.replace(/^(?:\p{Extended_Pictographic}|\p{Regional_Indicator}|[\uFE0F\u200D])+\s*/u, '').trim();
+    return stripped || name.trim();
+  };
+
+  const sendContactTurnNotification = async ({ assistantID, name, body, status } = {}) => {
+    if (typeof assistantID !== 'string' || !assistantID.trim()) return;
+    const settings = await readSettingsFromDisk();
+    if (settings.notifyOnCompletion === false) return;
+
+    const title = contactNotificationTitle(name);
+    const rawBody = typeof body === 'string' ? body : '';
+    let text = '';
+    try {
+      text = await prepareNotificationLastMessage({ message: rawBody, settings });
+    } catch {
+      text = '';
+    }
+    if (!text) text = status === 'error' ? 'Something went wrong' : 'New message';
+    const tag = `contact-${assistantID.trim()}`;
+
+    if (settings.nativeNotificationsEnabled) {
+      const notificationPayload = {
+        title,
+        body: text,
+        tag,
+        kind: 'contact',
+        assistantID: assistantID.trim(),
+        requireHidden: false,
+      };
+      const desktopNotificationDelivered = emitDesktopNotification(notificationPayload);
+      broadcastUiNotification(notificationPayload, { desktopNotificationDelivered });
+    }
+
+    const assistantPath = `/assistant/${encodeURIComponent(assistantID.trim())}`;
+    await fanoutPush(
+      {
+        title,
+        body: text,
+        tag,
+        data: {
+          url: assistantPath,
+          assistantID: assistantID.trim(),
+          type: 'contact',
+        },
+      },
+      { requireNoSse: true, preserveAlert: true },
+    );
+  };
+
   return {
     maybeSendPushForTrigger,
     setAutoAcceptSession,
@@ -720,5 +810,6 @@ export const createNotificationTriggerRuntime = (deps) => {
     setGetIsSessionAutoAccepting,
     clearPendingPushBadge,
     sendGoalSettlePush,
+    sendContactTurnNotification,
   };
 };

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

@@ -175,6 +175,58 @@ describe('notification trigger runtime smallModel suppression', () => {
     expect(emitDesktopNotification).toHaveBeenCalledTimes(1);
     expect(sendPushToAllUiSessions).toHaveBeenCalledTimes(1);
   });
+
+  it('skips ready notifications for child sessions', async () => {
+    vi.stubGlobal('fetch', vi.fn(async () => jsonResponse({
+      id: 'ses_child',
+      parentID: 'ses_parent',
+      title: 'Fixer',
+      metadata: {},
+    })));
+    const { runtime, emitDesktopNotification, sendPushToAllUiSessions } = createRuntime();
+    await runtime.maybeSendPushForTrigger(completionPayload('ses_child'));
+    expect(emitDesktopNotification).not.toHaveBeenCalled();
+    expect(sendPushToAllUiSessions).not.toHaveBeenCalled();
+  });
+
+  it('skips ready notifications for Assistant binding sessions', async () => {
+    vi.stubGlobal('fetch', vi.fn(async () => jsonResponse({
+      id: 'ses_binding',
+      parentID: null,
+      title: '大小白',
+      metadata: { openchamber: { assistant: { assistantID: 'asst_1', name: '大小白' } } },
+    })));
+    const { runtime, emitDesktopNotification, sendPushToAllUiSessions } = createRuntime();
+    await runtime.maybeSendPushForTrigger(completionPayload('ses_binding'));
+    expect(emitDesktopNotification).not.toHaveBeenCalled();
+    expect(sendPushToAllUiSessions).not.toHaveBeenCalled();
+  });
+
+  it('skips ready notifications for scheduled-task sessions', async () => {
+    vi.stubGlobal('fetch', vi.fn(async () => jsonResponse({
+      id: 'ses_sched',
+      parentID: null,
+      title: 'Nightly',
+      metadata: { openchamber: { scheduledTask: { taskID: 'task_1' } } },
+    })));
+    const { runtime, emitDesktopNotification, sendPushToAllUiSessions } = createRuntime();
+    await runtime.maybeSendPushForTrigger(completionPayload('ses_sched'));
+    expect(emitDesktopNotification).not.toHaveBeenCalled();
+    expect(sendPushToAllUiSessions).not.toHaveBeenCalled();
+  });
+
+  it('still notifies contact-assigned worker sessions that appear in the sidebar', async () => {
+    vi.stubGlobal('fetch', vi.fn(async () => jsonResponse({
+      id: 'ses_worker',
+      parentID: null,
+      title: 'Assigned work',
+      metadata: { openchamber: { assigned: { from: 'contact', assistantID: 'asst_1', name: '大小白' } } },
+    })));
+    const { runtime, emitDesktopNotification, sendPushToAllUiSessions } = createRuntime();
+    await runtime.maybeSendPushForTrigger(completionPayload('ses_worker'));
+    expect(emitDesktopNotification).toHaveBeenCalledTimes(1);
+    expect(sendPushToAllUiSessions).toHaveBeenCalledTimes(1);
+  });
 });
 
 const rootSessionResponse = () => jsonResponse({
@@ -199,6 +251,54 @@ const completionPayload = (sessionId = 'ses_root', finish = 'stop') => ({
   },
 });
 
+describe('contact turn notifications', () => {
+  it('sends an SMS-style title and body when a contact turn completes', async () => {
+    const { runtime, emitDesktopNotification, broadcastUiNotification, sendPushToAllUiSessions, sendApnsToAllUiSessions } = createRuntime();
+    await runtime.sendContactTurnNotification({
+      assistantID: 'asst_1',
+      name: '大小白',
+      body: '我去找一下',
+      status: 'complete',
+    });
+    expect(emitDesktopNotification).toHaveBeenCalledWith(expect.objectContaining({
+      title: '大小白',
+      body: '我去找一下',
+      tag: 'contact-asst_1',
+      kind: 'contact',
+      assistantID: 'asst_1',
+    }));
+    expect(broadcastUiNotification).toHaveBeenCalled();
+    expect(sendPushToAllUiSessions).toHaveBeenCalledWith(expect.objectContaining({
+      title: '大小白',
+      body: '我去找一下',
+      data: expect.objectContaining({ assistantID: 'asst_1', type: 'contact', url: '/assistant/asst_1' }),
+    }), expect.objectContaining({ requireNoSse: true, preserveAlert: true }));
+    expect(sendApnsToAllUiSessions).toHaveBeenCalledWith(expect.objectContaining({
+      title: '大小白',
+      body: '我去找一下',
+      data: expect.objectContaining({
+        assistantID: 'asst_1',
+        url: 'openchamber://assistant/asst_1',
+      }),
+    }), expect.objectContaining({ preserveAlert: true }));
+    expect(sendApnsToAllUiSessions.mock.calls[0][0].type).toBeUndefined();
+  });
+
+  it('skips contact notifications when completion notices are disabled', async () => {
+    const { runtime, emitDesktopNotification, sendPushToAllUiSessions } = createRuntime({
+      readSettingsFromDisk: vi.fn(async () => ({ ...defaultSettings, notifyOnCompletion: false })),
+    });
+    await runtime.sendContactTurnNotification({
+      assistantID: 'asst_1',
+      name: '大小白',
+      body: 'hi',
+      status: 'complete',
+    });
+    expect(emitDesktopNotification).not.toHaveBeenCalled();
+    expect(sendPushToAllUiSessions).not.toHaveBeenCalled();
+  });
+});
+
 describe('notification trigger live activity end', () => {
   it('ends the live activity on top-level completion and error', async () => {
     vi.stubGlobal('fetch', vi.fn(async () => rootSessionResponse()));
@@ -232,6 +332,28 @@ describe('notification trigger live activity end', () => {
     expect(sendApnsToAllUiSessions).toHaveBeenCalledTimes(1);
   });
 
+  it('does not patch live activity titles for child sessions', async () => {
+    vi.stubGlobal('fetch', vi.fn(async () => jsonResponse({
+      id: 'ses_child',
+      parentID: 'ses_parent',
+      metadata: {},
+    })));
+    const { runtime, sendLiveActivityEnd } = createRuntime();
+    await runtime.maybeSendPushForTrigger({
+      type: 'session.updated',
+      properties: {
+        directory: '/repo',
+        info: {
+          id: 'ses_child',
+          sessionID: 'ses_child',
+          parentID: 'ses_parent',
+          title: 'Fixer',
+        },
+      },
+    });
+    expect(sendLiveActivityEnd).not.toHaveBeenCalled();
+  });
+
   it('suppresses live activity end for child and small-model sessions', async () => {
     const fetchMock = vi.fn(async (url) => {
       if (String(url).includes('ses_child')) {

package/server/lib/opencode/feature-routes-runtime.js

@@ -15,6 +15,7 @@ import { registerScheduledTaskToolRoute } from '../scheduled-tasks/managed-tool-
 import { registerConversationRoutes } from '../conversations/routes.js';
 import { registerSessionTurnPageRoutes } from '../session-turn-pages/routes.js';
 import { registerAssistantRoutes } from '../assistants/routes.js';
+import { registerLlmRoutes } from '../llm/routes.js';
 import { registerMessageQueueRoutes } from '../message-queue/routes.js';
 import { registerSkillRoutes } from './skill-routes.js';
 import { registerPluginRoutes } from './plugin-routes.js';
@@ -126,6 +127,8 @@ export const createFeatureRoutesRuntime = (dependencies) => {
       broadcastGlobalUiEvent,
       globalMessageStreamHub,
       getServerId,
+      sessionIndexService,
+      notifyContactTurnComplete,
     } = routeDependencies;
 
     registerSettingsUtilityRoutes(app, {
@@ -215,6 +218,15 @@ export const createFeatureRoutesRuntime = (dependencies) => {
       getOpenChamberEventClients,
       writeSseEvent,
     });
+    // Contact turn lifecycle / bubble deltas — same SSE bus, not revision watermark.
+    const broadcastContactTurnEvent = createOpenChamberEventBroadcaster({
+      getOpenChamberEventClients,
+      writeSseEvent,
+    });
+    registerLlmRoutes(app, {
+      buildOpenCodeUrl,
+      getOpenCodeAuthHeaders,
+    });
     assistantRoutesRuntime = registerAssistantRoutes(app, {
       openchamberDataDir,
       dbPath: path.join(openchamberDataDir, 'assistants.sqlite'),
@@ -222,12 +234,30 @@ export const createFeatureRoutesRuntime = (dependencies) => {
       getOpenCodeAuthHeaders,
       getServerId,
       getAllowedRoots: () => assistantAllowedRoots,
+      listProjects: async () => {
+        const settings = await readSettingsFromDiskMigrated();
+        return sanitizeProjects(settings?.projects ?? [])
+          .filter((project) => project && typeof project.id === 'string' && typeof project.path === 'string')
+          .map((project) => ({
+            id: project.id,
+            path: project.path,
+            ...(typeof project.label === 'string' && project.label.trim()
+              ? { label: project.label.trim() }
+              : {}),
+          }));
+      },
+      listScheduledTasks: (projectID) => projectConfigRuntime.listScheduledTasks(projectID),
+      sessionIndexService,
+      upsertScheduledTask: (projectID, task) => projectConfigRuntime.upsertScheduledTask(projectID, task),
+      syncScheduledTaskProject: (projectID) => scheduledTasksRuntime.syncProject(projectID),
       refreshAllowedRoots: refreshAssistantAllowedRoots,
       globalEventHub: globalMessageStreamHub,
       onRevisionTip: (tip) => broadcastAssistantRevisionTip({
         type: 'openchamber:assistants-changed',
         properties: tip,
       }),
+      onContactTurnEvent: (event) => broadcastContactTurnEvent(event),
+      onContactTurnComplete: (event) => notifyContactTurnComplete?.(event),
     });
     messageQueueRuntime?.setAssistantDeliveryService?.(assistantRoutesRuntime.service);
 

package/server/lib/opencode/feature-routes-runtime.test.js

@@ -3,6 +3,26 @@ import { describe, expect, it, vi } from 'vitest';
 import { createWorktreeTopologyBroadcaster } from './feature-routes-runtime.js';
 
 describe('feature routes runtime composition', () => {
+  it('wires scheduled-task upsert into assistant contact tools', async () => {
+    const source = await fs.readFile(new URL('./feature-routes-runtime.js', import.meta.url), 'utf8');
+    expect(source).toMatch(/registerAssistantRoutes\(app, \{[\s\S]*upsertScheduledTask:[\s\S]*projectConfigRuntime\.upsertScheduledTask/);
+    expect(source).toMatch(/registerAssistantRoutes\(app, \{[\s\S]*syncScheduledTaskProject:[\s\S]*scheduledTasksRuntime\.syncProject/);
+    expect(source).toMatch(/registerAssistantRoutes\(app, \{[\s\S]*listProjects:/);
+    expect(source).toMatch(/registerAssistantRoutes\(app, \{[\s\S]*listScheduledTasks:[\s\S]*projectConfigRuntime\.listScheduledTasks/);
+    expect(source).toMatch(/registerAssistantRoutes\(app, \{[\s\S]*sessionIndexService/);
+    expect(source).toMatch(/label: project\.label\.trim\(\)/);
+  });
+
+  it('fans contact turn events out on the OpenChamber SSE bus separately from revision tips', async () => {
+    const source = await fs.readFile(new URL('./feature-routes-runtime.js', import.meta.url), 'utf8');
+    expect(source).toMatch(/const broadcastContactTurnEvent = createOpenChamberEventBroadcaster\(/);
+    expect(source).toMatch(/onContactTurnEvent: \(event\) => broadcastContactTurnEvent\(event\)/);
+    expect(source).toMatch(/onContactTurnComplete: \(event\) => notifyContactTurnComplete\?\.\(event\)/);
+    expect(source).toMatch(/onRevisionTip: \(tip\) => broadcastAssistantRevisionTip\(\{\s*type: 'openchamber:assistants-changed'/);
+    // Contact turn envelopes stay off the assistants-changed revision watermark path.
+    expect(source).not.toMatch(/onRevisionTip:[\s\S]*contact-turn/);
+  });
+
   it('registers the managed scheduled-task tool route with its required dependencies', async () => {
     const source = await fs.readFile(new URL('./feature-routes-runtime.js', import.meta.url), 'utf8');
     expect(source).toContain("import { registerScheduledTaskToolRoute } from '../scheduled-tasks/managed-tool-route.js';");