diff --git a/CLAUDE.md b/CLAUDE.md
index afbbd593..d168661f 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -88,6 +88,7 @@ tail -f /tmp/cmux-debug.log
 ## Pitfalls
 
 - Do not add an app-level display link or manual `ghostty_surface_draw` loop; rely on Ghostty wakeups/renderer to avoid typing lag.
+- **Submodule safety:** When modifying a submodule (ghostty, vendor/bonsplit, etc.), always push the submodule commit to its remote `main` branch BEFORE committing the updated pointer in the parent repo. Never commit on a detached HEAD or temporary branch — the commit will be orphaned and lost. Verify with: `cd <submodule> && git merge-base --is-ancestor HEAD origin/main`.
 
 ## E2E mac UI tests
 
diff --git a/ghostty b/ghostty
index eac00f33..efb0b03d 160000
--- a/ghostty
+++ b/ghostty
@@ -1 +1 @@
-Subproject commit eac00f33d6dc3af98546b045d89c5dde0a6a2ef6
+Subproject commit efb0b03d11e267192b234431ac8a0b986724057e
diff --git a/vendor/bonsplit b/vendor/bonsplit
index a8834d85..2702b704 160000
--- a/vendor/bonsplit
+++ b/vendor/bonsplit
@@ -1 +1 @@
-Subproject commit a8834d85a64939deb2c0b178688f0e6592b32b69
+Subproject commit 2702b70437a83b12f0245d15e7928b02e50386ad