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

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/git/DOCUMENTATION.md

@@ -54,6 +54,7 @@ The following functions are exported and used by the web server:
 - `validateWorktreeCreate(directory, input)`: Validate worktree creation parameters (mode, branchName, startRef, upstream config).
 - `createWorktree(directory, input)`: Create a new worktree (supports 'new' and 'existing' modes, upstream setup).
 - `removeWorktree(directory, input)`: Remove a worktree (optionally delete local branch).
+- `removeWorktree(directory, input, { beforeRemove })`: optional host hook after primary-workspace/catalog validation, immediately before removal of a matched worktree or managed orphan. The hook never runs for unrelated orphan paths. Production hosts use the official v2 `debug.location.evict` with the validated target and current upstream URL/auth; the 2s budget returns `released`, `failed`, `timeout`, or `unavailable`. Eviction is best effort and never counts as successful Git removal. DELETE responses include `locationRelease` when attempted. Shared-service explicit removal retains the existing force-delete semantics for that target; it is not automatic idle cleanup and does not interrupt unrelated sessions. An eviction acknowledgement is cache detachment, not a guarantee that active borrowers released OS handles. Queue rollback and topology publication remain tied to the Git result.
 - `isLinkedWorktree(directory)`: Check if directory is a linked worktree (not primary).
 
 ### Commit and Remote Operations

package/server/lib/git/routes.js

@@ -1,4 +1,4 @@
-export function registerGitRoutes(app, { messageQueueService = null, createRequestID = () => globalThis.crypto.randomUUID(), broadcastWorktreeTopologyChanged = () => {} } = {}) {
+export function registerGitRoutes(app, { messageQueueService = null, createRequestID = () => globalThis.crypto.randomUUID(), broadcastWorktreeTopologyChanged = () => {}, releaseWorktreeLocation } = {}) {
   const normalizeWorktreePath = (value) => typeof value === 'string' ? value.trim().replace(/\\/g, '/').replace(/\/+$/, '') : '';
   const lifecycleOperations = new Map();
   const acquireWorktreeLifecycleOperation = (runtimeKey, directory) => {
@@ -1282,11 +1282,14 @@ export function registerGitRoutes(app, { messageQueueService = null, createReque
         }
 
         let result;
+        let locationRelease;
         try {
           result = await removeWorktree(directory, {
             directory: worktreeDirectory,
             deleteLocalBranch: req.body?.deleteLocalBranch === true,
-          });
+          }, ...(releaseWorktreeLocation ? [{ beforeRemove: async (target) => {
+            locationRelease = await releaseWorktreeLocation(target);
+          } }] : []));
         } catch (error) {
           if (messageQueueService) {
             try {
@@ -1328,7 +1331,7 @@ export function registerGitRoutes(app, { messageQueueService = null, createReque
               console.warn('Failed to roll back message queue worktree deletion');
             }
           }
-          return res.json({ success: false });
+          return res.json({ success: false, ...(locationRelease ? { locationRelease } : {}) });
         }
 
         notifyWorktreeTopologyChanged(directory, worktreeDirectory, 'removed');
@@ -1346,7 +1349,7 @@ export function registerGitRoutes(app, { messageQueueService = null, createReque
             return res.status(500).json({ error: 'Failed to commit worktree queue deletion' });
           }
         }
-        res.json({ success: true });
+        res.json({ success: true, ...(locationRelease ? { locationRelease } : {}) });
       } finally {
         releaseWorktreeLifecycleOperation(operation);
       }

package/server/lib/git/routes.test.js

@@ -69,6 +69,40 @@ const createMockResponse = () => {
   };
 };
 
+describe('worktree eviction best effort', () => {
+  it.each(['released', 'failed', 'timeout', 'unavailable'])('preserves successful deletion with release outcome %s', async (state) => {
+    const { app, getRoute } = createRouteRegistry();
+    const releaseWorktreeLocation = vi.fn(async () => ({ state }));
+    const broadcastWorktreeTopologyChanged = vi.fn();
+    registerGitRoutes(app, { releaseWorktreeLocation, broadcastWorktreeTopologyChanged });
+    gitLibraries.removeWorktree.mockImplementation(async (_root, _input, options) => {
+      await options.beforeRemove('/validated/worktree');
+      return true;
+    });
+    const response = createMockResponse();
+    await getRoute('DELETE', '/api/git/worktrees')({ query: { directory: '/repo' }, body: { directory: '/requested/worktree' } }, response);
+    expect(releaseWorktreeLocation).toHaveBeenCalledWith('/validated/worktree');
+    expect(response.body).toEqual({ success: true, locationRelease: { state } });
+    expect(broadcastWorktreeTopologyChanged).toHaveBeenCalledTimes(1);
+  });
+  it('does not publish topology when removal fails after successful release', async () => {
+    const { app, getRoute } = createRouteRegistry();
+    const broadcastWorktreeTopologyChanged = vi.fn();
+    registerGitRoutes(app, { releaseWorktreeLocation: async () => ({ state: 'released' }), broadcastWorktreeTopologyChanged });
+    gitLibraries.removeWorktree.mockImplementation(async (_root, _input, options) => {
+      await options.beforeRemove('/repo/worktree');
+      throw new Error('deletion failed');
+    });
+    const response = createMockResponse();
+    const log = vi.spyOn(console, 'error').mockImplementation(() => {});
+    try {
+      await getRoute('DELETE', '/api/git/worktrees')({ query: { directory: '/repo' }, body: { directory: '/repo/worktree' } }, response);
+    } finally { log.mockRestore(); }
+    expect(response.statusCode).toBe(500);
+    expect(broadcastWorktreeTopologyChanged).not.toHaveBeenCalled();
+  });
+});
+
 describe('git routes batch discover', () => {
   beforeEach(() => {
     gitLibraries.isGitRepository.mockReset();

package/server/lib/git/service.js

@@ -3851,7 +3851,7 @@ export async function getWorktreeBootstrapStatus(directory) {
   };
 }
 
-export async function removeWorktree(directory, input = {}) {
+export async function removeWorktree(directory, input = {}, { beforeRemove } = {}) {
   const targetDirectory = normalizeDirectoryPath(input?.directory);
   if (!targetDirectory) {
     throw new Error('Worktree directory is required');
@@ -3887,6 +3887,7 @@ export async function removeWorktree(directory, input = {}) {
 
     const targetExists = await checkPathExists(targetDirectory);
     if (targetExists && isManagedOrphan) {
+      await beforeRemove?.(targetDirectory);
       await fsp.rm(targetDirectory, { recursive: true, force: true });
     }
 
@@ -3901,6 +3902,7 @@ export async function removeWorktree(directory, input = {}) {
     return true;
   }
 
+  await beforeRemove?.(matchedEntry.worktree);
   await runGitCommandOrThrow(
     context.primaryWorktree,
     ['worktree', 'remove', '--force', matchedEntry.worktree],

package/server/lib/llm/DOCUMENTATION.md

@@ -39,8 +39,8 @@ call Anthropic/OpenAI/plugin SDKs, and does not use the `openai` npm package.
 `openchamber-text` agent (same temp root, same deny-all verification and
 `session.create` / `session.remove` lifecycle as the attachment path below):
 
-1. Ensure `.opencode/agent/openchamber-text.md` and verify its final
-   permission rule is deny-all before creating the session.
+1. Ensure `.opencode/agent/openchamber-text.md` and verify its last catch-all
+   permission rule is deny-all, with only deny rules after it, before creating the session.
 2. `session.create({ location, agent: 'openchamber-text', model, metadata })`.
 3. `session.generate({ sessionID, prompt })` → `{ text }`. One model call with
    the session's provider context, no tool loop, no messages written. System
@@ -62,8 +62,10 @@ data-URL file parts:
 
 1. Ensure the throwaway temp directory agent markdown (`openchamber-llm`,
    permissions array ending in `action:* resource:* effect:deny`).
-2. `agent.get({ agentID: 'openchamber-llm', location })` and require the **final**
-   permissions rule to be deny-all. Failure → `llm_attachment_generation_unavailable`
+2. `agent.get({ agentID: 'openchamber-llm', location })` and require the **last catch-all**
+   permissions rule to be deny-all, with only deny rules after it. This accepts
+   OpenCode's appended `browser` deny while rejecting trailing allow/ask rules.
+   Failure → `llm_attachment_generation_unavailable`
    **before** any `session.prompt`. Title is never treated as permission isolation.
 3. `session.create({ location, agent, model: { id, providerID, variant? },
    metadata: { openchamber: { llm: { purpose: 'chat-completions' } } } })`

package/server/lib/llm/generate.js

@@ -18,7 +18,7 @@ const positiveMs = (value, fallback) => (
 
 /**
  * Agent frontmatter for official client agent permissions (action/resource/effect).
- * The final rule must be deny-all; assertLlmAgentDenyAll verifies that before prompt.
+ * The final catch-all must deny, with only denies after it; verified before prompt.
  */
 const AGENT_MARKDOWN = `---
 mode: primary
@@ -308,7 +308,7 @@ const readGeneratorAgent = async ({ client, location, signal, agentID, waitMs, p
 };
 
 /**
- * Verify the generator agent ends with deny-all permissions.
+ * Verify the generator agent has a deny-all rule followed only by denies.
  * Title alone is never treated as isolation. Failure must happen before prompt.
  */
 export async function assertLlmAgentDenyAll({
@@ -336,13 +336,12 @@ export async function assertLlmAgentDenyAll({
       'llm_attachment_generation_unavailable',
     );
   }
-  const last = permissions[permissions.length - 1];
-  if (
-    !last
-    || last.action !== '*'
-    || last.resource !== '*'
-    || last.effect !== 'deny'
-  ) {
+  const lastCatchAll = permissions.findLastIndex(
+    (rule) => rule?.action === '*' && rule?.resource === '*',
+  );
+  const isolated = lastCatchAll > -1
+    && permissions.slice(lastCatchAll).every((rule) => rule?.effect === 'deny');
+  if (!isolated) {
     failGenerate(
       'OpenCode LLM agent final permission is not deny-all; generation blocked',
       'llm_attachment_generation_unavailable',

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

@@ -127,8 +127,16 @@ function textSessionClient({ generate = vi.fn(async () => ({ text: 'reply' })),
 }
 
 describe('generateOpenCodeText — text path', () => {
-  it('runs session.generate in a verified deny-all throwaway session and removes it', async () => {
-    const { client, agentGet, create, generate, remove, prompt } = textSessionClient()
+  it.each([
+    { name: 'deny-all alone', suffix: [] },
+    { name: 'appended browser deny', suffix: [{ action: 'browser', resource: '*', effect: 'deny' }] },
+  ])('runs session.generate in a verified throwaway session ($name) and removes it', async ({ suffix }) => {
+    const { client, agentGet, create, generate, remove, prompt } = textSessionClient({
+      agentGet: vi.fn(async () => ({
+        ...denyAllTextAgent,
+        data: { ...denyAllTextAgent.data, permissions: [...denyAllTextAgent.data.permissions, ...suffix] },
+      })),
+    })
     const ensureTempDirectory = vi.fn(async ({ agentName, agentMarkdown }) => {
       expect(agentName).toBe(_test.TEXT_AGENT_NAME)
       expect(agentMarkdown).toBe(_test.TEXT_AGENT_MARKDOWN)
@@ -188,10 +196,23 @@ describe('generateOpenCodeText — text path', () => {
     }
   })
 
-  it('blocks before creating a session when the text agent is not deny-all', async () => {
+  it.each([
+    { name: 'no catch-all', permissions: [{ action: 'browser', resource: '*', effect: 'deny' }] },
+    ...['allow', 'ask'].flatMap((effect) => ['*', 'edit'].map((action) => ({
+      name: `trailing ${action} ${effect} before browser deny`,
+      permissions: [
+        ...denyAllTextAgent.data.permissions,
+        { action, resource: '*', effect },
+        { action: 'browser', resource: '*', effect: 'deny' },
+      ],
+    }))),
+    { name: 'missing permissions', permissions: undefined },
+    { name: 'empty permissions', permissions: [] },
+    { name: 'invalid trailing rule', permissions: [...denyAllTextAgent.data.permissions, null] },
+  ])('blocks before creating a session: $name', async ({ permissions }) => {
     const { client, create, generate } = textSessionClient({
       agentGet: vi.fn(async () => ({
-        data: { id: 'openchamber-text', permissions: [{ action: 'bash', resource: '*', effect: 'allow' }] },
+        data: { id: 'openchamber-text', permissions },
       })),
     })
     await expect(generateOpenCodeText({
@@ -316,8 +337,14 @@ describe('generateOpenCodeText — text path', () => {
 })
 
 describe('generateOpenCodeText — attachment session path', () => {
-  it('verifies deny-all before prompt, prompts with files, waits, lists, and removes', async () => {
-    const agentGet = vi.fn(async () => denyAllAgent)
+  it.each([
+    { name: 'deny-all alone', suffix: [] },
+    { name: 'appended browser deny', suffix: [{ action: 'browser', resource: '*', effect: 'deny' }] },
+  ])('verifies deny-all ($name) before prompt, prompts with files, waits, lists, and removes', async ({ suffix }) => {
+    const agentGet = vi.fn(async () => ({
+      ...denyAllAgent,
+      data: { ...denyAllAgent.data, permissions: [...denyAllAgent.data.permissions, ...suffix] },
+    }))
     const create = vi.fn(async () => ({ id: 'ses_tmp' }))
     const put = vi.fn(async () => undefined)
     const prompt = vi.fn(async () => ({ id: 'inbox_1', type: 'user' }))

package/server/lib/message-queue/service.js

@@ -246,7 +246,7 @@ export const createMessageQueueService = ({ dbPath, getRuntimeConfig = () => nul
         totalPasteLength += reference.text.length;
         if (totalPasteLength > MAX_COMPOSER_PASTE_TOTAL_LENGTH) fail('validation_error');
         canonical += reference.text;
-      } else if (reference.kind === 'skill' && Object.keys(reference).every((key) => ['id', 'kind', 'start', 'end', 'display', 'skillName'].includes(key)) && nonEmptyString(reference.skillName, MAX_COMPOSER_SKILL_NAME) && /^[A-Za-z0-9][A-Za-z0-9_-]*$/.test(reference.skillName) && (reference.display === `/${reference.skillName}` || reference.display === `/\u2003${reference.skillName}`)) canonical += `[skill:${reference.skillName}]`;
+      } else if (reference.kind === 'skill' && Object.keys(reference).every((key) => ['id', 'kind', 'start', 'end', 'display', 'skillName'].includes(key)) && nonEmptyString(reference.skillName, MAX_COMPOSER_SKILL_NAME) && /^[^\s/\\[\]\r\n]+$/u.test(reference.skillName) && [`/${reference.skillName}`, `/\u2003${reference.skillName}`, `@${reference.skillName}`, `@\u2003${reference.skillName}`].includes(reference.display)) canonical += `[skill:${reference.skillName}]`;
       else if (reference.kind === 'command' && Object.keys(reference).every((key) => ['id', 'kind', 'start', 'end', 'display', 'commandName', 'reference'].includes(key)) && nonEmptyString(reference.commandName, MAX_COMPOSER_COMMAND_NAME) && /^[\p{L}\p{N}._/-]+$/u.test(reference.commandName) && nonEmptyString(reference.reference, MAX_COMPOSER_COMMAND_REFERENCE) && !/[\]\r\n]/u.test(reference.reference) && (reference.display === `/${reference.commandName}` || reference.display === `/\u2003${reference.commandName}`)) canonical += `[command:${reference.reference}]`;
       else fail('validation_error');
       previousEnd = reference.end;

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.