From b8bf4843518c4dc1319d4476adda0cc9cc169045 Mon Sep 17 00:00:00 2001
From: teknium1 <127238744+teknium1@users.noreply.github.com>
Date: Mon, 14 Sep 2026 16:13:16 -0700
Subject: [PATCH] test(bot-mode): keep the reproducible mock patch
 whitespace-clean

---
 evals/botmode-dm-matrix/README.md          | 4 ++--
 evals/botmode-dm-matrix/mock-trigger.patch | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/evals/botmode-dm-matrix/README.md b/evals/botmode-dm-matrix/README.md
index 3b1a6fe291..64441cc291 100644
--- a/evals/botmode-dm-matrix/README.md
+++ b/evals/botmode-dm-matrix/README.md
@@ -6,13 +6,13 @@ Run from the repository root after installing root npm dependencies and building
 
 ```sh
 cp evals/botmode-dm-matrix/probe-dm-matrix.spec.ts apps/desktop/e2e/
-git apply evals/botmode-dm-matrix/mock-trigger.patch
+git apply --unidiff-zero evals/botmode-dm-matrix/mock-trigger.patch
 (cd apps/desktop && npm run build)
 # Set DISPLAY, current XAUTHORITY, XDG_RUNTIME_DIR and VIRTUAL_ENV first.
 (cd apps/desktop && HERMES_DESKTOP_CDP_PORT=off BOT_DM_SERVICE_PATH=1 \
   BOT_DM_EVIDENCE=/tmp/botmode-dm-matrix-proof \
   npx playwright test e2e/probe-dm-matrix.spec.ts --reporter=list)
-git apply -R evals/botmode-dm-matrix/mock-trigger.patch
+git apply --unidiff-zero -R evals/botmode-dm-matrix/mock-trigger.patch
 rm apps/desktop/e2e/probe-dm-matrix.spec.ts
 ```
 
diff --git a/evals/botmode-dm-matrix/mock-trigger.patch b/evals/botmode-dm-matrix/mock-trigger.patch
index bae97952c9..ddb7a6109d 100644
--- a/evals/botmode-dm-matrix/mock-trigger.patch
+++ b/evals/botmode-dm-matrix/mock-trigger.patch
@@ -2,10 +2,7 @@ diff --git a/tests-js/scripts/mock-server.ts b/tests-js/scripts/mock-server.ts
 index 6dffd2cf0f388..09c6de07d81b2 100644
 --- a/tests-js/scripts/mock-server.ts
 +++ b/tests-js/scripts/mock-server.ts
-@@ -500,6 +500,21 @@ export function startMockServer(options: MockServerOptions = {}): Promise<MockSe
-             _receivedUserTexts.push(userText)
-           }
- 
+@@ -502,0 +503,15 @@ export function startMockServer(options: MockServerOptions = {}): Promise<MockSe
 +          const dmMatch = userText.match(/E2E_DM\(([^)]+)\)\[([\s\S]*)\]/)
 +          const lastUserIndex = messages.lastIndexOf(lastUserMsg)
 +          if (dmMatch && !messages.slice(lastUserIndex + 1).some(m => m?.role === 'tool')) {
@@ -21,6 +18,3 @@ index 6dffd2cf0f388..09c6de07d81b2 100644
 +            return
 +          }
 +
-           const isInterimTrigger = userText.includes('E2E_INTERIM_TRIGGER')
-           const isSidebarTrigger = userText.includes('E2E_SIDEBAR_TRIGGER')
-           const isSidebarCrossTrigger = userText.includes('E2E_SIDEBAR_CROSS')