Merge pull request #1363 from manaflow-ai/task-nightly-pure-prompt-followup

Restore Ghostty Pure prompt redraw fix
This commit is contained in:
Lawrence Chen 2026-03-13 05:59:18 -07:00 committed by GitHub
commit c0693e147f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 2 deletions

View file

@ -77,14 +77,16 @@ touch the same stale-frame mitigation path and tend to conflict in the same file
- Commits:
- `0cf559581` (zsh: fix Pure-style multiline prompt redraws)
- `312c7b23a` (zsh: avoid extra Pure continuation markers)
- `404a3f175` (Fix Pure prompt redraw markers)
- Files:
- `src/shell-integration/zsh/ghostty-integration`
- Summary:
- Handles multiline prompts that use `\n%{\r%}` to return to column 0 before the visible prompt line.
- Keeps redraw-safe prompt-start markers for async themes.
- Avoids inserting an explicit continuation marker after Pure's hidden carriage return, because Ghostty already tracks the newline as prompt continuation and the extra marker duplicates the preprompt row.
- Restores that prompt-marker behavior on top of the current Ghostty `main` base after the older redraw fix drifted out during later submodule updates.
The fork branch HEAD is now the section 6 zsh redraw commit.
The fork branch HEAD is now the section 6 zsh redraw follow-up commit.
## Upstreamed fork changes

@ -1 +1 @@
Subproject commit a50579bd5ddec81c6244b9b349d4bf781f667cec
Subproject commit 404a3f175ba6baafabc46cac807194883e040980

View file

@ -5,3 +5,4 @@
a50579bd5ddec81c6244b9b349d4bf781f667cec f7e9c0597468a263d6b75eaf815ccecd90c7933f3cf4ae58929569ff23b2666d
0cf5595817794466e3a60abe6bf97f8494dedcfe 1c6ae53ea549740bd45e59fe92714a292fb0d71a41ff915eb6b2e644468152de
312c7b23a7c8dc0704431940d76ba5dc32a46afb ae73cb18a9d6efec42126a1d99e0e9d12022403d7dc301dfa21ed9f7c89c9e30
404a3f175ba6baafabc46cac807194883e040980 bcbd2954f4746fe5bcb4bfca6efeddd3ea355fda2836371f4c7150271c58acbd