From 6e09c1677cd8e0e358e5393f25f8360fccadfd03 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Thu, 19 Mar 2026 14:56:53 +0100
Subject: [PATCH 1/2] Update lexxy to fix # prompt editor freeze

Point lexxy to main which includes the fix for the editor freeze
when typing # followed by space. The race condition caused
selectionTransform crashes when the markdown heading shortcut
consumed the trigger during async prompt loading.

Fixes https://app.fizzy.do/5986089/cards/3454
---
 Gemfile           |  2 +-
 Gemfile.lock      | 12 +++++++++---
 Gemfile.saas.lock | 12 +++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 597899b7da..4ce57db41f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ gem "geared_pagination", "~> 1.2"
 gem "rqrcode"
 gem "rouge"
 gem "jbuilder"
-gem "lexxy", "0.8.5.beta"
+gem "lexxy", github: "basecamp/lexxy", branch: "main"
 gem "image_processing", "~> 1.14"
 gem "platform_agent"
 gem "aws-sdk-s3", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index a015538d4a..a6513bc146 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/basecamp/lexxy.git
+  revision: 4b718b01cbd786a65f51f9c9ff59141161b4b972
+  branch: main
+  specs:
+    lexxy (0.8.5.beta)
+      rails (>= 8.0.2)
+
 GIT
   remote: https://github.com/basecamp/useragent
   revision: 433ca320a42db1266c4b89df74d0abdb9a880c5e
@@ -254,8 +262,6 @@ GEM
       logger (~> 1.6)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
-    lexxy (0.8.5.beta)
-      rails (>= 8.0.2)
     lint_roller (1.1.0)
     logger (1.7.0)
     loofah (2.25.0)
@@ -518,7 +524,7 @@ DEPENDENCIES
   jbuilder
   kamal
   letter_opener
-  lexxy (= 0.8.5.beta)
+  lexxy!
   mission_control-jobs
   mittens
   mocha
diff --git a/Gemfile.saas.lock b/Gemfile.saas.lock
index cf0de14239..d12a99a8b4 100644
--- a/Gemfile.saas.lock
+++ b/Gemfile.saas.lock
@@ -21,6 +21,14 @@ GIT
       rails (>= 7.0)
       rainbow
 
+GIT
+  remote: https://github.com/basecamp/lexxy.git
+  revision: 4b718b01cbd786a65f51f9c9ff59141161b4b972
+  branch: main
+  specs:
+    lexxy (0.8.5.beta)
+      rails (>= 8.0.2)
+
 GIT
   remote: https://github.com/basecamp/queenbee-plugin
   revision: 14312a940471e20617b38cdec7c092a01567d18b
@@ -367,8 +375,6 @@ GEM
       logger (~> 1.6)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
-    lexxy (0.8.5.beta)
-      rails (>= 8.0.2)
     lint_roller (1.1.0)
     logger (1.7.0)
     loofah (2.25.0)
@@ -724,7 +730,7 @@ DEPENDENCIES
   jbuilder
   kamal
   letter_opener
-  lexxy (= 0.8.5.beta)
+  lexxy!
   mission_control-jobs
   mittens
   mocha

From bde47ad64ce7902cff58f473c71c000ec3b57051 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge.manrubia@gmail.com>
Date: Thu, 19 Mar 2026 19:48:01 +0100
Subject: [PATCH 2/2] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 4ce57db41f..d0c7af163a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ gem "geared_pagination", "~> 1.2"
 gem "rqrcode"
 gem "rouge"
 gem "jbuilder"
-gem "lexxy", github: "basecamp/lexxy", branch: "main"
+gem "lexxy", bc: "lexxy", branch: "main"
 gem "image_processing", "~> 1.14"
 gem "platform_agent"
 gem "aws-sdk-s3", require: false