feat: complete Mesh UX and Matrix hardening

Merge the verified Mesh UX, Matrix hardening, and timezone-independent grouping test into main.

Author: dhawal-ss

mesh/e2e/authenticated-shell.spec.ts

@@ -43,6 +43,11 @@ async function installAuthenticatedMatrixMock(
         service: parsed.searchParams.get('community_service')
           ?? parsed.searchParams.get('service'),
         admissionService: parsed.searchParams.get('admission'),
+        communityName: 'Invited Mesh Community',
+        inviterDisplayName: 'Bob',
+        inviterUserId: '@bob:mesh.test',
+        joinRule: 'public',
+        communityServiceDisplayName: 'Matrix Test Service',
         storedAt: 1_752_000_000_000,
         expiresAt: 1_754_592_000_000,
       }
@@ -415,14 +420,18 @@ async function openAuthenticatedShell(
 ): Promise<void> {
   await installAuthenticatedMatrixMock(page, currentDeepLinks)
   await page.goto('/')
+  if (currentDeepLinks?.length) {
+    await expect(
+      page.getByRole('dialog', { name: 'Review community invitation' }),
+    ).toBeVisible({ timeout: 10_000 })
+    return
+  }
   await expect(
     page.getByRole('navigation', { name: 'Communities and direct messages' }),
   ).toBeVisible({ timeout: 10_000 })
-  if (!currentDeepLinks?.length) {
-    await expect(page.getByRole('log', { name: 'Messages in #general' })).toBeVisible({
-      timeout: 10_000,
-    })
-  }
+  await expect(page.getByRole('log', { name: 'Messages in #general' })).toBeVisible({
+    timeout: 10_000,
+  })
 }
 
 function ipcCalls(page: Page): Promise<IpcCall[]> {
@@ -460,6 +469,16 @@ test.describe('authenticated desktop shell', () => {
       'mesh://join?v=3&kind=matrix&room=!invited:mesh.test&via=mesh.test&service=https%3A%2F%2Fmatrix.mesh.test'
     await openAuthenticatedShell(page, [invite])
 
+    const review = page.getByRole('dialog', { name: 'Review community invitation' })
+    await expect(review).toBeVisible()
+    await expect(review.getByText('Invited Mesh Community', { exact: true })).toBeVisible()
+    await expect(review.getByText('Invited by Bob', { exact: true })).toBeVisible()
+    await expect(review.getByText('Matrix Test Service', { exact: true })).toBeVisible()
+    await expect.poll(async () => (
+      (await ipcCalls(page)).filter((call) => call.command === 'matrix_join_community')
+    )).toEqual([])
+
+    await review.getByRole('button', { name: 'Confirm and continue' }).click()
     await expect.poll(async () => (
       (await ipcCalls(page)).filter((call) => call.command === 'matrix_join_community')
     )).toEqual([{
@@ -469,6 +488,9 @@ test.describe('authenticated desktop shell', () => {
         via: ['mesh.test'],
       },
     }])
+    await expect(
+      page.getByRole('navigation', { name: 'Communities and direct messages' }),
+    ).toBeVisible()
     await expect.poll(async () => (
       (await ipcCalls(page))
         .filter((call) => [
@@ -489,7 +511,7 @@ test.describe('authenticated desktop shell', () => {
       'aria-current',
       'page',
     )
-    await expect(page.getByRole('dialog', { name: 'Join a community' })).toHaveCount(0)
+    await expect(review).toHaveCount(0)
 
   })
 
@@ -672,11 +694,21 @@ test.describe('authenticated desktop shell', () => {
     await openAuthenticatedShell(page)
 
     const randomChannel = page.getByRole('button', {
-      name: 'Text room: random, 1 unread',
+      name: /^Text room: random/,
     })
     await randomChannel.click({ button: 'right' })
     const menu = page.getByRole('menu', { name: 'Actions for random' })
-    await expect(menu.getByRole('menuitem', { name: 'Mute for 15 minutes' })).toBeVisible()
+    await menu.getByRole('menuitem', { name: 'Mute notifications' }).click()
+
+    await expect.poll(async () => ipcCalls(page)).toContainEqual({
+      command: 'matrix_set_room_notification_mode',
+      args: {
+        roomId: '!random:mesh.test',
+        mode: 'nothing',
+      },
+    })
+
+    await randomChannel.click({ button: 'right' })
     await menu
       .getByRole('menuitem', { name: 'Notifications: Only @mentions' })
       .click()

mesh/e2e/dm-message-keyboard-actions.spec.ts

@@ -313,8 +313,10 @@ test.describe('DM message action bar keyboard access (V-25 follow-up)', () => {
 
     const bobRow = page.getByRole('group', { name: /^Message from Bob,/ })
     const ownRow = page.getByRole('group', { name: /^Message from alice,/ })
-    const reactButtonBob = bobRow.getByRole('button', { name: 'Add reaction' })
-    const replyButtonBob = bobRow.getByRole('button', { name: 'Reply to message' })
+    // DMs now use the shared channel row, whose accessible action names
+    // include the author so repeated controls remain distinguishable.
+    const reactButtonBob = bobRow.getByRole('button', { name: 'React to message from Bob' })
+    const replyButtonBob = bobRow.getByRole('button', { name: 'Reply to Bob' })
     const editButtonOwn = ownRow.getByRole('button', { name: 'Edit message' })
     // Opacity/pointer-events live on the action bar's wrapper div, not the
     // buttons themselves — assert visibility there, matching Message.tsx's
@@ -328,15 +330,17 @@ test.describe('DM message action bar keyboard access (V-25 follow-up)', () => {
 
     // --- React (on Bob's message) ---
     await page.keyboard.press('Enter')
-    const thumbsUp = page.getByRole('button', { name: '👍', exact: true })
+    const thumbsUp = page.getByRole('button', { name: 'React with thumbs up', exact: true })
     await tabUntilFocused(page, thumbsUp, 'forward')
     await page.keyboard.press('Enter')
 
     await expect.poll(async () => ipcCalls(page)).toContainEqual({
       command: 'matrix_toggle_reaction',
       args: { roomId: '!alice-bob-dm:mesh.test', eventId: '$dm-history', key: '👍' },
     })
-    await expect(bobRow.getByRole('button', { name: '👍 1' })).toBeVisible()
+    await expect(
+      bobRow.getByRole('button', { name: /1 reaction, you reacted/ }),
+    ).toBeVisible()
 
     // --- Reply (to Bob's message) ---
     await tabUntilFocused(page, replyButtonBob, 'forward')
@@ -375,12 +379,12 @@ test.describe('DM message action bar keyboard access (V-25 follow-up)', () => {
     await expect(page.getByText("A DM Bob didn't send to himself.")).toBeVisible()
 
     const bobRow = page.getByRole('group', { name: /^Message from Bob,/ })
-    const reactButtonBob = bobRow.getByRole('button', { name: 'Add reaction' })
+    const reactButtonBob = bobRow.getByRole('button', { name: 'React to message from Bob' })
     await tabUntilFocused(page, reactButtonBob, 'backward')
 
     await expect(reactButtonBob).toHaveAttribute('aria-expanded', 'false')
     await page.keyboard.press('Enter')
-    const thumbsUp = page.getByRole('button', { name: '👍', exact: true })
+    const thumbsUp = page.getByRole('button', { name: 'React with thumbs up', exact: true })
     await expect(thumbsUp).toBeVisible()
     await expect(reactButtonBob).toHaveAttribute('aria-expanded', 'true')
 
@@ -389,7 +393,7 @@ test.describe('DM message action bar keyboard access (V-25 follow-up)', () => {
     await expect(reactButtonBob).toBeFocused()
     await expect(reactButtonBob).toHaveAttribute('aria-expanded', 'false')
     // No emoji was picked — the picker was dismissed, not activated.
-    await expect(bobRow.getByRole('button', { name: '👍 1' })).toHaveCount(0)
+    await expect(bobRow.getByRole('button', { name: /1 reaction, you reacted/ })).toHaveCount(0)
     expect(await ipcCalls(page)).not.toContainEqual(
       expect.objectContaining({ command: 'matrix_toggle_reaction' }),
     )
@@ -400,7 +404,7 @@ test.describe('DM message action bar keyboard access (V-25 follow-up)', () => {
     await expect(page.getByText("A DM Bob didn't send to himself.")).toBeVisible()
 
     const bobRow = page.getByRole('group', { name: /^Message from Bob,/ })
-    const reactButtonBob = bobRow.getByRole('button', { name: 'Add reaction' })
+    const reactButtonBob = bobRow.getByRole('button', { name: 'React to message from Bob' })
     const actionBarBob = reactButtonBob.locator('xpath=..')
     await expect(actionBarBob).toHaveCSS('opacity', '0')
 

mesh/e2e/matrix-messaging.spec.ts

@@ -253,6 +253,17 @@ async function installAuthenticatedMatrixMessagingMock(page: Page): Promise<void
           dmTimeline.push(message)
           return message
         }
+        case 'matrix_send_message': {
+          // DM text now uses the same durable room queue as channels. Keep
+          // attachment sends on the dedicated protected-DM command below.
+          const message = directMessage(String(args.body))
+          dmTimeline.push(message)
+          return {
+            ...message,
+            channelId: conversation.id,
+            transactionId: String(args.transactionId),
+          }
+        }
         case 'matrix_send_dm_attachment': {
           const filename = args.attachmentGrant === 'grant-mesh-beta'
             ? 'mesh-beta.pdf'
@@ -469,7 +480,7 @@ test.describe('Matrix direct messaging and encrypted attachments', () => {
     expect(await page.evaluate(() => document.activeElement === document.body)).toBe(false)
   })
 
-  test('sends DM text through the dedicated Matrix direct-message command', async ({ page }) => {
+  test('sends DM text through the durable Matrix room queue', async ({ page }) => {
     await openDirectMessage(page)
 
     const composer = page.getByRole('textbox', { name: 'Message Bob' })
@@ -483,13 +494,14 @@ test.describe('Matrix direct messaging and encrypted attachments', () => {
 
     const calls = await ipcCalls(page)
     expect(calls).toContainEqual({
-      command: 'matrix_send_dm',
+      command: 'matrix_send_message',
       args: expect.objectContaining({
-        recipientUserId: '@bob:mesh.test',
+        roomId: '!alice-bob-dm:mesh.test',
         body: 'A production-path encrypted DM',
+        transactionId: expect.any(String),
       }),
     })
-    expect(calls.some((call) => call.command === 'matrix_send_message')).toBe(false)
+    expect(calls.some((call) => call.command === 'matrix_send_dm')).toBe(false)
   })
 
   test('selects and sends a DM attachment through the native dialog and encrypted Matrix IPC', async ({ page }) => {
@@ -532,7 +544,12 @@ test.describe('Matrix direct messaging and encrypted attachments', () => {
     await openDirectMessage(page)
 
     await page.getByRole('button', { name: 'Download encrypted-plan.pdf' }).click()
-    const openButton = page.getByRole('button', { name: 'Open encrypted-plan.pdf' })
+    // The shared channel/DM row also exposes the protected preview button;
+    // exact matching selects the downloaded-file action.
+    const openButton = page.getByRole('button', {
+      name: 'Open encrypted-plan.pdf',
+      exact: true,
+    })
     await expect(openButton).toBeVisible()
     await openButton.click()
 

mesh/e2e/message-keyboard-actions.spec.ts

@@ -300,15 +300,17 @@ test.describe('message action bar keyboard access (V-25)', () => {
 
     // --- React ---
     await page.keyboard.press('Enter')
-    const thumbsUp = page.getByRole('button', { name: '👍', exact: true })
+    const thumbsUp = page.getByRole('button', { name: 'React with thumbs up', exact: true })
     await tabUntilFocused(page, thumbsUp, 'forward')
     await page.keyboard.press('Enter')
 
     await expect.poll(async () => ipcCalls(page)).toContainEqual({
       command: 'matrix_toggle_reaction',
       args: { roomId: '!general:mesh.test', eventId: '$bob-message', key: '👍' },
     })
-    await expect(page.getByRole('button', { name: '👍 1' })).toBeVisible()
+    // Reaction buttons now expose count and ownership as a complete accessible
+    // name instead of relying on their abbreviated visible text.
+    await expect(page.getByRole('button', { name: /👍, 1 reaction, you reacted/ })).toBeVisible()
 
     // --- Reply ---
     await tabUntilFocused(page, replyButton, 'forward')
@@ -344,7 +346,7 @@ test.describe('message action bar keyboard access (V-25)', () => {
     // --- Reaction picker: Escape closes it and returns focus to the trigger ---
     await expect(reactButton).toHaveAttribute('aria-expanded', 'false')
     await page.keyboard.press('Enter')
-    const thumbsUp = page.getByRole('button', { name: '👍', exact: true })
+    const thumbsUp = page.getByRole('button', { name: 'React with thumbs up', exact: true })
     await expect(thumbsUp).toBeVisible()
     await expect(reactButton).toHaveAttribute('aria-expanded', 'true')
 
@@ -353,7 +355,7 @@ test.describe('message action bar keyboard access (V-25)', () => {
     await expect(reactButton).toBeFocused()
     await expect(reactButton).toHaveAttribute('aria-expanded', 'false')
     // No emoji was picked — the picker was dismissed, not activated.
-    await expect(page.getByRole('button', { name: '👍 1' })).toHaveCount(0)
+    await expect(page.getByRole('button', { name: /👍, 1 reaction, you reacted/ })).toHaveCount(0)
 
     // --- Context menu: Shift+F10 moves focus into the first menu item ---
     await page.keyboard.press('Shift+F10')

mesh/e2e/onboarding-accessibility.spec.ts

@@ -240,7 +240,7 @@ test('@a11y has no automated WCAG A/AA violations on account-service selection',
 })
 
 test('@a11y has no automated WCAG A/AA violations on sign in', async ({ page }) => {
-  await page.getByRole('button', { name: 'Choose Matrix.org' }).click()
+  await page.getByRole('button', { name: 'Sign in with Matrix.org' }).click()
   const signInHeading = page.getByRole('heading', { name: 'Sign in to Matrix.org' })
   await expect(signInHeading).toBeVisible()
   await waitForAccountScreenMotion(page)
@@ -267,10 +267,10 @@ for (const viewport of [
       await expect(control).toBeInViewport()
     }
 
-    await assertReachable('Choose Matrix.org')
+    await assertReachable('Sign in with Matrix.org')
     await assertReachable('More public services')
     await assertReachable('Use another service')
-    await page.getByRole('button', { name: 'Choose Matrix.org' }).click()
+    await page.getByRole('button', { name: 'Sign in with Matrix.org' }).click()
     await page.getByRole('textbox', { name: 'Username' }).fill('compact-user')
     await page.locator('input[name="password"]').fill('a long compact passphrase')
     await expect(page.getByRole('button', { name: 'Sign in', exact: true })).toBeEnabled()
@@ -390,8 +390,8 @@ test('prefills and resolves a cold-start invitation before account creation', as
     command: 'resolve_pending_invitation',
     args: {},
   }])
-  await expect(page.getByRole('button', { name: 'Choose Matrix.org' })).toBeVisible()
-  await page.getByRole('button', { name: 'Choose community-hosted service' }).click()
+  await expect(page.getByRole('button', { name: 'Sign in with Matrix.org' })).toBeVisible()
+  await page.getByRole('button', { name: 'Create account with community.example' }).click()
   await expect(page.getByText('Invitation saved securely on this device')).toBeVisible()
   await expect(page.getByText('Community target: !invited:friends.example.')).toBeVisible()
   await expect(page.getByRole('textbox', { name: 'Invitation code' })).toHaveCount(0)
@@ -405,7 +405,7 @@ test('keeps trust context and account setup usable in a narrow window', async ({
   await expect(shell).toBeVisible()
   await expect(page.getByText('Conversations that stay yours.')).toBeVisible()
   await expect(page.getByRole('list', { name: 'Setup progress' })).toBeVisible()
-  await expect(page.getByRole('button', { name: 'Choose Matrix.org' })).toBeVisible()
+  await expect(page.getByRole('button', { name: 'Sign in with Matrix.org' })).toBeVisible()
 
   const bounds = await shell.boundingBox()
   expect(bounds?.x).toBeGreaterThanOrEqual(0)

mesh/e2e/runtime-budgets.spec.ts

@@ -28,7 +28,7 @@ test('keeps the default onboarding path within wider-beta runtime budgets', asyn
 
   const startedAt = Date.now()
   await page.goto('/')
-  await expect(page.getByRole('button', { name: 'Choose Matrix.org' })).toBeVisible({
+  await expect(page.getByRole('button', { name: 'Sign in with Matrix.org' })).toBeVisible({
     timeout: STARTUP_READY_BUDGET_MS,
   })
   const readyMs = Date.now() - startedAt

mesh/src-tauri/src/app_runtime/helpers.rs

@@ -39,6 +39,7 @@ pub fn signed_file_announcement_to_message(
         edited_at: None,
         deleted_at: None,
         reply_to_id: None,
+        thread_root_id: None,
         transaction_id: None,
         client_request_id: None,
         delivery_status: None,

mesh/src-tauri/src/app_runtime/history.rs

@@ -245,6 +245,7 @@ pub(super) fn reconstruct_messages_from_events(
                         edited_at: None,
                         deleted_at: None,
                         reply_to_id,
+                        thread_root_id: None,
                         transaction_id: None,
                         client_request_id: None,
                         delivery_status: None,
@@ -523,6 +524,7 @@ mod tests {
                             edited_at: None,
                             deleted_at: None,
                             reply_to_id,
+                            thread_root_id: None,
                             transaction_id: None,
                             client_request_id: None,
                             delivery_status: None,

mesh/src-tauri/src/app_runtime/message_handler.rs

@@ -73,6 +73,7 @@ pub(super) async fn route_signed_message(app_handle: &AppHandle, envelope: &Sign
         edited_at: None,
         deleted_at: None,
         reply_to_id: payload.reply_to_id,
+        thread_root_id: None,
         transaction_id: None,
         client_request_id: None,
         delivery_status: None,

mesh/src-tauri/src/app_runtime/network_router.rs

@@ -776,6 +776,7 @@ async fn route_incoming_dm(app_handle: &AppHandle, envelope: &SignedEnvelope) {
         edited_at: None,
         deleted_at: None,
         reply_to_id: None,
+        thread_root_id: None,
         delivery_status: Some("sent".into()),
     };