Use a color other than yellow or red for commits on a branch that doesn't have an upstream

Update search position (match x of y) when changing the selection in a list view (#5169 )
When searching (not filtering) in a list view using `/`, moving the selection now updates the "x of y" indicator of the search results to the last one before the selection. Pressing `n` again searches from there rather than from the previously shown result. Also see corresponding gocui PR at https://github.com/jesseduffield/gocui/pull/95.
2026-10-05 21:46:49 -04:00 · 2026-01-05 21:50:32 +01:00 · 2026-01-04 18:54:28 +01:00 · 2026-01-04 18:51:45 +01:00 · 2026-01-04 18:48:47 +01:00 · 2026-01-03 20:23:27 +01:00
207 changed files with 20006 additions and 7824 deletions
@@ -1078,7 +1078,7 @@ services:
 Where:

 - `gitDomain` stands for the domain used by git itself (i.e. the one present on clone URLs), e.g. `git.work.com`
- `provider` is one of `github`, `bitbucket`, `bitbucketServer`, `azuredevops`, `gitlab` or `gitea`
+- `provider` is one of `github`, `bitbucket`, `bitbucketServer`, `azuredevops`, `gitlab`, `gitea` or `codeberg`
 - `webDomain` is the URL where your git service exposes a web interface and APIs, e.g. `gitservice.work.com`

 ## Predefined commit message prefix
@@ -192,6 +192,7 @@ The permitted option fields are:
 | name | The first part of the label | no |
 | description | The second part of the label | no |
 | value | the value that will be used in the command | yes |
+| key | Keybinding to invoke this menu option without needing to navigate to it. Can be a single letter or one of the values from [here](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md) | no |

 If an option has no name the value will be displayed to the user in place of the name, so you're allowed to only include the value like so:

@@ -233,6 +234,34 @@ customCommands:
            description: 'branch for a release'
 ```

+Here's an example of supplying keybindings for menu options:
+
+```yml
+customCommands:
+  - key: 'a'
+    command: 'echo {{.Form.BranchType | quote}}'
+    context: 'commits'
+    prompts:
+      - type: 'menu'
+        title: 'What kind of branch is it?'
+        key: 'BranchType'
+        options:
+          - value: 'feature'
+            name: 'feature branch'
+            description: 'branch based off develop'
+            key: 'f'
+          - value: 'hotfix'
+            name: 'hotfix branch'
+            description: 'branch based off main for fast bug fixes'
+            key: 'h'
+          - value: 'release'
+            name: 'release branch'
+            description: 'branch for a release'
+            key: 'r'
+```
+
+In this example, pressing 'f', 'h', or 'r' will directly select the corresponding option without needing to navigate to it first.
+
 ### Menu-from-command

 | _field_           | _description_                                                                                  | _required_ |
@@ -31,6 +31,8 @@ git:

 A cool feature of delta is --hyperlinks, which renders clickable links for the line numbers in the left margin, and lazygit supports these. To use them, set the `pager:` config to `delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"`; this allows you to click on an underlined line number in the diff to jump right to that same line in your editor.

+Note that delta's `--navigate` option doesn't work in lazygit, for technical reasons.
+
 ## Diff-so-fancy

 ```yaml
@@ -14,25 +14,25 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` @ `` | 打开命令日志菜单 | 查看命令日志的选项，例如显示/隐藏命令日志以及聚焦命令日志 |
 | `` P `` | 推送 | 推送当前分支到它的上游。如果上游未配置，您可以在弹窗中配置上游分支。 |
 | `` p `` | 拉取 | 从当前分支的远程分支获取改动。如果上游未配置，您可以在弹窗中配置上游分支。 |
-| `` ) `` | 提高重命名相似度阈值 | Increase the similarity threshold for a deletion and addition pair to be treated as a rename.<br><br>The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. |
-| `` ( `` | 降低重命名相似度阈值 | Decrease the similarity threshold for a deletion and addition pair to be treated as a rename.<br><br>The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. |
-| `` } `` | 扩大差异视图中显示的上下文范围 | Increase the amount of the context shown around changes in the diff view.<br><br>The default can be changed in the config file with the key 'git.diffContextSize'. |
-| `` { `` | 缩小差异视图中显示的上下文范围 | Decrease the amount of the context shown around changes in the diff view.<br><br>The default can be changed in the config file with the key 'git.diffContextSize'. |
+| `` ) `` | 提高重命名相似度阈值 | 提高将删除和添加对视为重命名所需的相似度阈值。<br><br>默认值可在配置文件中通过键 'git.renameSimilarityThreshold' 更改。 |
+| `` ( `` | 降低重命名相似度阈值 | 降低将删除和添加对视为重命名所需的相似度阈值。<br><br>默认值可在配置文件中通过键 'git.renameSimilarityThreshold' 更改。 |
+| `` } `` | 扩大差异视图中显示的上下文范围 | 增加差异视图中变更周围显示的上下文量。<br><br>默认值可在配置文件中通过键 'git.diffContextSize' 更改。 |
+| `` { `` | 缩小差异视图中显示的上下文范围 | 减少差异视图中变更周围显示的上下文量。<br><br>默认值可在配置文件中通过键 'git.diffContextSize' 更改。 |
 | `` : `` | 执行 Shell 命令 | 调出可输入shell命令执行的提示符。 |
 | `` <c-p> `` | 查看自定义补丁选项 |  |
 | `` m `` | 查看合并/变基选项 | 查看当前合并或变基的中止、继续、跳过选项 |
-| `` R `` | 刷新 | 刷新git状态(即在后台上运行`git status`,`git branch`等命令以更新面板内容) 不会运行`git fetch` |
+| `` R `` | 刷新 | 刷新Git状态（即在后台运行`git status`、`git branch`等命令以更新面板内容）。此操作不会执行`git fetch`。 |
 | `` + `` | 下一屏模式(正常/半屏/全屏) |  |
 | `` _ `` | 上一屏模式 |  |
-| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers |
+| `` \| `` | 切换分页器 | 从已配置的分页器列表中选择下一个分页器 |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 打开菜单 |  |
 | `` <c-s> `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 |
 | `` W `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 |
 | `` <c-e> `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 |
 | `` q `` | 退出 |  |
-| `` <c-z> `` | Suspend the application |  |
-| `` <c-w> `` | 切换是否在差异视图中显示空白字符差异 | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
+| `` <c-z> `` | 挂起应用程序 |  |
+| `` <c-w> `` | 切换是否在差异视图中显示空白字符差异 | 切换是否在差异视图中显示空白字符更改。<br><br>默认值可在配置文件中通过键 'git.ignoreWhitespaceInDiffView' 更改。 |
 | `` z `` | 撤销 | Reflog将用于确定运行哪个git命令来撤消最后一个git命令。这并不包括对工作树的更改，只考虑提交。 |
 | `` Z `` | 重做 | Reflog将用于确定运行哪个git命令来重做上一个git命令。这并不包括对工作树的更改，只考虑提交。 |

@@ -53,33 +53,6 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` ] `` | 下一个标签 |  |
 | `` [ `` | 上一个标签 |  |

-## Input prompt
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 确认 |  |
-| `` <esc> `` | 关闭 |  |
-
-## Reflog
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 复制提交哈希到剪贴板 |  |
-| `` <space> `` | 检出 | 检出所选择的提交作为分离HEAD。 |
-| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
-| `` o `` | 在浏览器中打开提交 |  |
-| `` n `` | 从提交创建新分支 |  |
-| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
-| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
-| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
-| `` <c-r> `` | 重置已拣选(复制)的提交 |  |
-| `` <c-t> `` | 使用外部差异比较工具(git difftool) |  |
-| `` * `` | 选择当前分支的提交 |  |
-| `` 0 `` | 聚焦主视图 |  |
-| `` <enter> `` | 查看提交 |  |
-| `` w `` | 查看工作区选项 |  |
-| `` / `` | 通过文本过滤当前视图 |  |
-
 ## 子提交

 | Key | Action | Info |
@@ -89,7 +62,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
 | `` o `` | 在浏览器中打开提交 |  |
 | `` n `` | 从提交创建新分支 |  |
-| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
+| `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。<br><br>请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 |
 | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
 | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
 | `` <c-r> `` | 重置已拣选(复制)的提交 |  |
@@ -124,6 +97,26 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` d `` | 删除 | 删除选定的工作树。这将删除工作树的目录以及 .git 目录中有关工作树的元数据。 |
 | `` / `` | 通过文本过滤当前视图 |  |

+## 引用日志
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <c-o> `` | 复制提交哈希到剪贴板 |  |
+| `` <space> `` | 检出 | 检出所选择的提交作为分离HEAD。 |
+| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
+| `` o `` | 在浏览器中打开提交 |  |
+| `` n `` | 从提交创建新分支 |  |
+| `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。<br><br>请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 |
+| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
+| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
+| `` <c-r> `` | 重置已拣选(复制)的提交 |  |
+| `` <c-t> `` | 使用外部差异比较工具(git difftool) |  |
+| `` * `` | 选择当前分支的提交 |  |
+| `` 0 `` | 聚焦主视图 |  |
+| `` <enter> `` | 查看提交 |  |
+| `` w `` | 查看工作区选项 |  |
+| `` / `` | 通过文本过滤当前视图 |  |
+
 ## 提交

 | Key | Action | Info |
@@ -154,7 +147,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
 | `` o `` | 在浏览器中打开提交 |  |
 | `` n `` | 从提交创建新分支 |  |
-| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
+| `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。<br><br>请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 |
 | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
 | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
 | `` <c-t> `` | 使用外部差异比较工具(git difftool) |  |
@@ -180,7 +173,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` c `` | 检出 | 检出文件 |
 | `` d `` | 删除 | 放弃对此文件的提交变更 |
 | `` o `` | 打开文件 | 使用默认程序打开该文件 |
-| `` e `` | 编辑 | 使用外部编辑器打开文件 |
+| `` e `` | 编辑(Edit) | 使用外部编辑器打开文件 |
 | `` <c-t> `` | 使用外部差异比较工具(git difftool) |  |
 | `` <space> `` | 补丁中包含的切换文件 | 切换文件是否包含在自定义补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
 | `` a `` | 操作所有文件 | 添加或删除所有提交中的文件到自定义的补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
@@ -204,7 +197,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` A `` | 修补最后一次提交 |  |
 | `` C `` | 使用 Git 编辑器提交变更 |  |
 | `` <c-f> `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` e `` | 编辑 | 使用外部编辑器打开文件 |
+| `` e `` | 编辑(Edit) | 使用外部编辑器打开文件 |
 | `` o `` | 打开文件 | 使用默认程序打开该文件 |
 | `` i `` | 忽略文件 |  |
 | `` r `` | 刷新文件 |  |
@@ -217,7 +210,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` D `` | 重置 | 查看工作树的重置选项（例如：清除工作树）。 |
 | `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径，树布局按目录分组文件。<br><br>可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 |
 | `` <c-t> `` | 使用外部差异比较工具(git difftool) |  |
-| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
+| `` M `` | 查看合并冲突选项 | 查看用于解决合并冲突的选项。 |
 | `` f `` | 抓取 | 从远程获取变更 |
 | `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 |
 | `` = `` | 展开全部文件 | 展开文件树中的全部目录 |
@@ -232,7 +225,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` i `` | 显示 git-flow 选项 |  |
 | `` <space> `` | 检出 | 检出选中的项目 |
 | `` n `` | 新分支 |  |
-| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
+| `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。<br><br>请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 |
 | `` o `` | 创建拉取请求 |  |
 | `` O `` | 创建拉取请求选项 |  |
 | `` <c-y> `` | 复制拉取请求 URL 到剪贴板 |  |
@@ -261,7 +254,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` <left> `` | 选择上一个区块 |  |
 | `` <right> `` | 选择下一个区块 |  |
 | `` v `` | 切换拖动选择 |  |
-| `` a `` | 切换代码块选择 | Toggle line-by-line vs. hunk selection mode. |
+| `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
 | `` <c-o> `` | 复制选中文本到剪贴板 |  |
 | `` o `` | 打开文件 | 使用默认程序打开该文件 |
 | `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
@@ -290,7 +283,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
-| `` <esc> `` | Exit back to side panel |  |
+| `` <esc> `` | 退出回到侧边面板 |  |
 | `` / `` | 开始搜索 |  |

 ## 正在合并
@@ -306,7 +299,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` z `` | 撤销 | 撤消上次合并冲突解决 |
 | `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
 | `` o `` | 打开文件 | 使用默认程序打开该文件 |
-| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
+| `` M `` | 查看合并冲突选项 | 查看用于解决合并冲突的选项。 |
 | `` <esc> `` | 返回文件面板 |  |

 ## 正在暂存
@@ -316,7 +309,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` <left> `` | 选择上一个区块 |  |
 | `` <right> `` | 选择下一个区块 |  |
 | `` v `` | 切换拖动选择 |  |
-| `` a `` | 切换代码块选择 | Toggle line-by-line vs. hunk selection mode. |
+| `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
 | `` <c-o> `` | 复制选中文本到剪贴板 |  |
 | `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
 | `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 |
@@ -338,7 +331,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` mouse wheel down (fn+up) `` | 向下滚动 |  |
 | `` mouse wheel up (fn+down) `` | 向上滚动 |  |
 | `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
-| `` <esc> `` | Exit back to side panel |  |
+| `` <esc> `` | 退出回到侧边面板 |  |
 | `` / `` | 开始搜索 |  |

 ## 状态
@@ -382,6 +375,13 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` w `` | 查看工作区选项 |  |
 | `` / `` | 通过文本过滤当前视图 |  |

+## 输入提示
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | 确认 |  |
+| `` <esc> `` | 关闭 |  |
+
 ## 远程

 | Key | Action | Info |
@@ -389,9 +389,9 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` <enter> `` | 查看分支 |  |
 | `` n `` | 添加新的远程仓库 |  |
 | `` d `` | 删除 | 删除选中的远程。从远程跟踪远程分支的任何本地分支都不会受到影响。 |
-| `` e `` | 编辑 | 编辑远程仓库 |
+| `` e `` | 编辑(Edit) | 编辑远程仓库 |
 | `` f `` | 抓取 | 抓取远程仓库 |
-| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
+| `` F `` | 添加复刻远程仓库 | 通过替换 origin URL 中的所有者来快速添加复刻远程仓库，并可选择从新远程仓库检出分支。 |
 | `` / `` | 通过文本过滤当前视图 |  |

 ## 远程分支
@@ -1078,7 +1078,7 @@ services:
 Where:

 - `gitDomain` stands for the domain used by git itself (i.e. the one present on clone URLs), e.g. `git.work.com`
- `provider` is one of `github`, `bitbucket`, `bitbucketServer`, `azuredevops`, `gitlab` or `gitea`
+- `provider` is one of `github`, `bitbucket`, `bitbucketServer`, `azuredevops`, `gitlab`, `gitea` or `codeberg`
 - `webDomain` is the URL where your git service exposes a web interface and APIs, e.g. `gitservice.work.com`

 ## Predefined commit message prefix
@@ -192,6 +192,7 @@ The permitted option fields are:
 | name | The first part of the label | no |
 | description | The second part of the label | no |
 | value | the value that will be used in the command | yes |
+| key | Keybinding to invoke this menu option without needing to navigate to it. Can be a single letter or one of the values from [here](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md) | no |

 If an option has no name the value will be displayed to the user in place of the name, so you're allowed to only include the value like so:

@@ -233,6 +234,34 @@ customCommands:
            description: 'branch for a release'
 ```

+Here's an example of supplying keybindings for menu options:
+
+```yml
+customCommands:
+  - key: 'a'
+    command: 'echo {{.Form.BranchType | quote}}'
+    context: 'commits'
+    prompts:
+      - type: 'menu'
+        title: 'What kind of branch is it?'
+        key: 'BranchType'
+        options:
+          - value: 'feature'
+            name: 'feature branch'
+            description: 'branch based off develop'
+            key: 'f'
+          - value: 'hotfix'
+            name: 'hotfix branch'
+            description: 'branch based off main for fast bug fixes'
+            key: 'h'
+          - value: 'release'
+            name: 'release branch'
+            description: 'branch for a release'
+            key: 'r'
+```
+
+In this example, pressing 'f', 'h', or 'r' will directly select the corresponding option without needing to navigate to it first.
+
 ### Menu-from-command

 | _field_           | _description_                                                                                  | _required_ |
@@ -31,6 +31,8 @@ git:

 A cool feature of delta is --hyperlinks, which renders clickable links for the line numbers in the left margin, and lazygit supports these. To use them, set the `pager:` config to `delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"`; this allows you to click on an underlined line number in the diff to jump right to that same line in your editor.

+Note that delta's `--navigate` option doesn't work in lazygit, for technical reasons.
+
 ## Diff-so-fancy

 ```yaml
@@ -14,25 +14,25 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` @ `` | 打开命令日志菜单 | 查看命令日志的选项，例如显示/隐藏命令日志以及聚焦命令日志 |
 | `` P `` | 推送 | 推送当前分支到它的上游。如果上游未配置，您可以在弹窗中配置上游分支。 |
 | `` p `` | 拉取 | 从当前分支的远程分支获取改动。如果上游未配置，您可以在弹窗中配置上游分支。 |
-| `` ) `` | 提高重命名相似度阈值 | Increase the similarity threshold for a deletion and addition pair to be treated as a rename.<br><br>The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. |
-| `` ( `` | 降低重命名相似度阈值 | Decrease the similarity threshold for a deletion and addition pair to be treated as a rename.<br><br>The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. |
-| `` } `` | 扩大差异视图中显示的上下文范围 | Increase the amount of the context shown around changes in the diff view.<br><br>The default can be changed in the config file with the key 'git.diffContextSize'. |
-| `` { `` | 缩小差异视图中显示的上下文范围 | Decrease the amount of the context shown around changes in the diff view.<br><br>The default can be changed in the config file with the key 'git.diffContextSize'. |
+| `` ) `` | 提高重命名相似度阈值 | 提高将删除和添加对视为重命名所需的相似度阈值。<br><br>默认值可在配置文件中通过键 'git.renameSimilarityThreshold' 更改。 |
+| `` ( `` | 降低重命名相似度阈值 | 降低将删除和添加对视为重命名所需的相似度阈值。<br><br>默认值可在配置文件中通过键 'git.renameSimilarityThreshold' 更改。 |
+| `` } `` | 扩大差异视图中显示的上下文范围 | 增加差异视图中变更周围显示的上下文量。<br><br>默认值可在配置文件中通过键 'git.diffContextSize' 更改。 |
+| `` { `` | 缩小差异视图中显示的上下文范围 | 减少差异视图中变更周围显示的上下文量。<br><br>默认值可在配置文件中通过键 'git.diffContextSize' 更改。 |
 | `` : `` | 执行 Shell 命令 | 调出可输入shell命令执行的提示符。 |
 | `` <c-p> `` | 查看自定义补丁选项 |  |
 | `` m `` | 查看合并/变基选项 | 查看当前合并或变基的中止、继续、跳过选项 |
-| `` R `` | 刷新 | 刷新git状态(即在后台上运行`git status`,`git branch`等命令以更新面板内容) 不会运行`git fetch` |
+| `` R `` | 刷新 | 刷新Git状态（即在后台运行`git status`、`git branch`等命令以更新面板内容）。此操作不会执行`git fetch`。 |
 | `` + `` | 下一屏模式(正常/半屏/全屏) |  |
 | `` _ `` | 上一屏模式 |  |
-| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers |
+| `` \| `` | 切换分页器 | 从已配置的分页器列表中选择下一个分页器 |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 打开菜单 |  |
 | `` <c-s> `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 |
 | `` W `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 |
 | `` <c-e> `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 |
 | `` q `` | 退出 |  |
-| `` <c-z> `` | Suspend the application |  |
-| `` <c-w> `` | 切换是否在差异视图中显示空白字符差异 | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
+| `` <c-z> `` | 挂起应用程序 |  |
+| `` <c-w> `` | 切换是否在差异视图中显示空白字符差异 | 切换是否在差异视图中显示空白字符更改。<br><br>默认值可在配置文件中通过键 'git.ignoreWhitespaceInDiffView' 更改。 |
 | `` z `` | 撤销 | Reflog将用于确定运行哪个git命令来撤消最后一个git命令。这并不包括对工作树的更改，只考虑提交。 |
 | `` Z `` | 重做 | Reflog将用于确定运行哪个git命令来重做上一个git命令。这并不包括对工作树的更改，只考虑提交。 |

@@ -53,33 +53,6 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` ] `` | 下一个标签 |  |
 | `` [ `` | 上一个标签 |  |

-## Input prompt
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 确认 |  |
-| `` <esc> `` | 关闭 |  |
-
-## Reflog
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 复制提交哈希到剪贴板 |  |
-| `` <space> `` | 检出 | 检出所选择的提交作为分离HEAD。 |
-| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
-| `` o `` | 在浏览器中打开提交 |  |
-| `` n `` | 从提交创建新分支 |  |
-| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
-| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
-| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
-| `` <c-r> `` | 重置已拣选(复制)的提交 |  |
-| `` <c-t> `` | 使用外部差异比较工具(git difftool) |  |
-| `` * `` | 选择当前分支的提交 |  |
-| `` 0 `` | 聚焦主视图 |  |
-| `` <enter> `` | 查看提交 |  |
-| `` w `` | 查看工作区选项 |  |
-| `` / `` | 通过文本过滤当前视图 |  |
-
 ## 子提交

 | Key | Action | Info |
@@ -89,7 +62,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
 | `` o `` | 在浏览器中打开提交 |  |
 | `` n `` | 从提交创建新分支 |  |
-| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
+| `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。<br><br>请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 |
 | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
 | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
 | `` <c-r> `` | 重置已拣选(复制)的提交 |  |
@@ -124,6 +97,26 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` d `` | 删除 | 删除选定的工作树。这将删除工作树的目录以及 .git 目录中有关工作树的元数据。 |
 | `` / `` | 通过文本过滤当前视图 |  |

+## 引用日志
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <c-o> `` | 复制提交哈希到剪贴板 |  |
+| `` <space> `` | 检出 | 检出所选择的提交作为分离HEAD。 |
+| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
+| `` o `` | 在浏览器中打开提交 |  |
+| `` n `` | 从提交创建新分支 |  |
+| `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。<br><br>请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 |
+| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
+| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
+| `` <c-r> `` | 重置已拣选(复制)的提交 |  |
+| `` <c-t> `` | 使用外部差异比较工具(git difftool) |  |
+| `` * `` | 选择当前分支的提交 |  |
+| `` 0 `` | 聚焦主视图 |  |
+| `` <enter> `` | 查看提交 |  |
+| `` w `` | 查看工作区选项 |  |
+| `` / `` | 通过文本过滤当前视图 |  |
+
 ## 提交

 | Key | Action | Info |
@@ -154,7 +147,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
 | `` o `` | 在浏览器中打开提交 |  |
 | `` n `` | 从提交创建新分支 |  |
-| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
+| `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。<br><br>请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 |
 | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
 | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
 | `` <c-t> `` | 使用外部差异比较工具(git difftool) |  |
@@ -180,7 +173,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` c `` | 检出 | 检出文件 |
 | `` d `` | 删除 | 放弃对此文件的提交变更 |
 | `` o `` | 打开文件 | 使用默认程序打开该文件 |
-| `` e `` | 编辑 | 使用外部编辑器打开文件 |
+| `` e `` | 编辑(Edit) | 使用外部编辑器打开文件 |
 | `` <c-t> `` | 使用外部差异比较工具(git difftool) |  |
 | `` <space> `` | 补丁中包含的切换文件 | 切换文件是否包含在自定义补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
 | `` a `` | 操作所有文件 | 添加或删除所有提交中的文件到自定义的补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
@@ -204,7 +197,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` A `` | 修补最后一次提交 |  |
 | `` C `` | 使用 Git 编辑器提交变更 |  |
 | `` <c-f> `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` e `` | 编辑 | 使用外部编辑器打开文件 |
+| `` e `` | 编辑(Edit) | 使用外部编辑器打开文件 |
 | `` o `` | 打开文件 | 使用默认程序打开该文件 |
 | `` i `` | 忽略文件 |  |
 | `` r `` | 刷新文件 |  |
@@ -217,7 +210,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` D `` | 重置 | 查看工作树的重置选项（例如：清除工作树）。 |
 | `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径，树布局按目录分组文件。<br><br>可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 |
 | `` <c-t> `` | 使用外部差异比较工具(git difftool) |  |
-| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
+| `` M `` | 查看合并冲突选项 | 查看用于解决合并冲突的选项。 |
 | `` f `` | 抓取 | 从远程获取变更 |
 | `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 |
 | `` = `` | 展开全部文件 | 展开文件树中的全部目录 |
@@ -232,7 +225,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` i `` | 显示 git-flow 选项 |  |
 | `` <space> `` | 检出 | 检出选中的项目 |
 | `` n `` | 新分支 |  |
-| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
+| `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。<br><br>请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 |
 | `` o `` | 创建拉取请求 |  |
 | `` O `` | 创建拉取请求选项 |  |
 | `` <c-y> `` | 复制拉取请求 URL 到剪贴板 |  |
@@ -261,7 +254,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` <left> `` | 选择上一个区块 |  |
 | `` <right> `` | 选择下一个区块 |  |
 | `` v `` | 切换拖动选择 |  |
-| `` a `` | 切换代码块选择 | Toggle line-by-line vs. hunk selection mode. |
+| `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
 | `` <c-o> `` | 复制选中文本到剪贴板 |  |
 | `` o `` | 打开文件 | 使用默认程序打开该文件 |
 | `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
@@ -290,7 +283,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
-| `` <esc> `` | Exit back to side panel |  |
+| `` <esc> `` | 退出回到侧边面板 |  |
 | `` / `` | 开始搜索 |  |

 ## 正在合并
@@ -306,7 +299,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` z `` | 撤销 | 撤消上次合并冲突解决 |
 | `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
 | `` o `` | 打开文件 | 使用默认程序打开该文件 |
-| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
+| `` M `` | 查看合并冲突选项 | 查看用于解决合并冲突的选项。 |
 | `` <esc> `` | 返回文件面板 |  |

 ## 正在暂存
@@ -316,7 +309,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` <left> `` | 选择上一个区块 |  |
 | `` <right> `` | 选择下一个区块 |  |
 | `` v `` | 切换拖动选择 |  |
-| `` a `` | 切换代码块选择 | Toggle line-by-line vs. hunk selection mode. |
+| `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
 | `` <c-o> `` | 复制选中文本到剪贴板 |  |
 | `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
 | `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 |
@@ -338,7 +331,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` mouse wheel down (fn+up) `` | 向下滚动 |  |
 | `` mouse wheel up (fn+down) `` | 向上滚动 |  |
 | `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
-| `` <esc> `` | Exit back to side panel |  |
+| `` <esc> `` | 退出回到侧边面板 |  |
 | `` / `` | 开始搜索 |  |

 ## 状态
@@ -382,6 +375,13 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` w `` | 查看工作区选项 |  |
 | `` / `` | 通过文本过滤当前视图 |  |

+## 输入提示
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | 确认 |  |
+| `` <esc> `` | 关闭 |  |
+
 ## 远程

 | Key | Action | Info |
@@ -389,9 +389,9 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` <enter> `` | 查看分支 |  |
 | `` n `` | 添加新的远程仓库 |  |
 | `` d `` | 删除 | 删除选中的远程。从远程跟踪远程分支的任何本地分支都不会受到影响。 |
-| `` e `` | 编辑 | 编辑远程仓库 |
+| `` e `` | 编辑(Edit) | 编辑远程仓库 |
 | `` f `` | 抓取 | 抓取远程仓库 |
-| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
+| `` F `` | 添加复刻远程仓库 | 通过替换 origin URL 中的所有者来快速添加复刻远程仓库，并可选择从新远程仓库检出分支。 |
 | `` / `` | 通过文本过滤当前视图 |  |

 ## 远程分支
@@ -12,21 +12,21 @@ require (
 	github.com/aybabtme/humanlog v0.4.1
 	github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
 	github.com/creack/pty v1.1.11
-	github.com/gdamore/tcell/v2 v2.9.0
+	github.com/gdamore/tcell/v2 v2.13.5
 	github.com/go-errors/errors v1.5.1
 	github.com/gookit/color v1.4.2
 	github.com/integrii/flaggy v1.4.0
 	github.com/jesseduffield/generics v0.0.0-20250517122708-b0b4a53a6f5c
 	github.com/jesseduffield/go-git/v5 v5.14.1-0.20250407170251-e1a013310ccd
-	github.com/jesseduffield/gocui v0.3.1-0.20251002151855-67e0e55ff42a
+	github.com/jesseduffield/gocui v0.3.1-0.20260104174656-7b510338b235
 	github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/karimkhaleel/jsonschema v0.0.0-20231001195015-d933f0d94ea3
 	github.com/kyokomi/emoji/v2 v2.2.8
 	github.com/lucasb-eyer/go-colorful v1.3.0
-	github.com/mattn/go-runewidth v0.0.19
 	github.com/mgutz/str v1.2.0
 	github.com/mitchellh/go-ps v1.0.0
+	github.com/rivo/uniseg v0.4.7
 	github.com/sahilm/fuzzy v0.1.0
 	github.com/samber/lo v1.31.0
 	github.com/sanity-io/litter v1.5.2
@@ -38,8 +38,8 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
-	golang.org/x/sync v0.18.0
-	golang.org/x/sys v0.38.0
+	golang.org/x/sync v0.19.0
+	golang.org/x/sys v0.39.0
 	gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -49,7 +49,6 @@ require (
 	github.com/ProtonMail/go-crypto v1.1.6 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -79,8 +78,8 @@ require (
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	golang.org/x/crypto v0.45.0 // indirect
 	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/term v0.37.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/term v0.38.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
 	gopkg.in/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
@@ -65,8 +65,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/clipperhouse/uax29/v2 v2.2.0 h1:ChwIKnQN3kcZteTXMgb1wztSgaU+ZemkgWdohwgs8tY=
-github.com/clipperhouse/uax29/v2 v2.2.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
 github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
 github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:tuijfIjZyjZaHq9xDUh0tNitwXshJpbLkqMOJv4H3do=
@@ -97,12 +95,10 @@ github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
 github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
-github.com/gdamore/tcell/v2 v2.8.0/go.mod h1:bj8ori1BG3OYMjmb3IklZVWfZUJ1UBQt9JXrOCOhGWw=
-github.com/gdamore/tcell/v2 v2.9.0 h1:N6t+eqK7/xwtRPwxzs1PXeRWnm0H9l02CrgJ7DLn1ys=
-github.com/gdamore/tcell/v2 v2.9.0/go.mod h1:8/ZoqM9rxzYphT9tH/9LnunhV9oPBqwS8WHGYm5nrmo=
+github.com/gdamore/tcell/v2 v2.13.5 h1:YvWYCSr6gr2Ovs84dXbZLjDuOfQchhj8buOEqY52rpA=
+github.com/gdamore/tcell/v2 v2.13.5/go.mod h1:+Wfe208WDdB7INEtCsNrAN6O2m+wsTPk1RAovjaILlo=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
 github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
-github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
 github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
 github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
@@ -155,7 +151,6 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
@@ -194,8 +189,8 @@ github.com/jesseduffield/generics v0.0.0-20250517122708-b0b4a53a6f5c h1:tC2Paiis
 github.com/jesseduffield/generics v0.0.0-20250517122708-b0b4a53a6f5c/go.mod h1:F2fEBk0ddf6ixrBrJjY7phfQ3hL9rXG0uSjvwYe50bE=
 github.com/jesseduffield/go-git/v5 v5.14.1-0.20250407170251-e1a013310ccd h1:ViKj6qth8FgcIWizn9KiACWwPemWSymx62OPN0tHT+Q=
 github.com/jesseduffield/go-git/v5 v5.14.1-0.20250407170251-e1a013310ccd/go.mod h1:lRhCiBr6XjQrvcQVa+UYsy/99d3wMXn/a0nSQlhnhlA=
-github.com/jesseduffield/gocui v0.3.1-0.20251002151855-67e0e55ff42a h1:z3NQvFXAWGT4B/MwQBZc+1ej8WJ/Nv35xngQRvwzPuI=
-github.com/jesseduffield/gocui v0.3.1-0.20251002151855-67e0e55ff42a/go.mod h1:sLIyZ2J42R6idGdtemZzsiR3xY5EF0KsvYEGh3dQv3s=
+github.com/jesseduffield/gocui v0.3.1-0.20260104174656-7b510338b235 h1:1MjdFm1rUneE1eMYeRkAA3kXswY+h5eLhgJFaZQs9j0=
+github.com/jesseduffield/gocui v0.3.1-0.20260104174656-7b510338b235/go.mod h1:lQCd2TvvNXVKFBowy4A7xxZbUp+1KEiGs4j0Q5Zt9gQ=
 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY=
 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5/go.mod h1:qxN4mHOAyeIDLP7IK7defgPClM/z1Kze8VVQiaEjzsQ=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
@@ -222,7 +217,6 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/kyokomi/emoji/v2 v2.2.8 h1:jcofPxjHWEkJtkIbcLHvZhxKgCPl6C7MyjTrD4KDqUE=
 github.com/kyokomi/emoji/v2 v2.2.8/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE=
-github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
 github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
@@ -236,9 +230,6 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
-github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
 github.com/mgutz/str v1.2.0 h1:4IzWSdIz9qPQWLfKZ0rJcV0jcUDpxvP4JVZ4GXQyvSw=
 github.com/mgutz/str v1.2.0/go.mod h1:w1v0ofgLaJdoD0HpQ3fycxKD1WtxpjSo151pK/31q6w=
 github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
@@ -258,8 +249,7 @@ github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
@@ -323,9 +313,6 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
 golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -365,9 +352,6 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -402,10 +386,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
 golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -429,12 +409,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20170407050850-f3918c30c5c2/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -482,24 +458,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
-golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
-golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
+golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
+golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -509,13 +474,9 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -568,8 +529,6 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -546,7 +546,9 @@ func setCommitStatuses(unpushedCommitHashes *set.Set[string], unmergedCommitHash
 		}

 		if unmergedCommitHashes == nil || unmergedCommitHashes.Includes(commit.Hash()) {
-			if unpushedCommitHashes != nil && unpushedCommitHashes.Includes(commit.Hash()) {
+			if unpushedCommitHashes == nil {
+				commits[i].Status = models.StatusNone
+			} else if unpushedCommitHashes.Includes(commit.Hash()) {
 				commits[i].Status = models.StatusUnpushed
 			} else {
 				commits[i].Status = models.StatusPushed
@@ -569,7 +571,7 @@ func (self *CommitLoader) getReachableHashes(refName string, notRefNames []strin
 		DontLog().
 		RunWithOutputs()
 	if err != nil {
-		return set.New[string]()
+		return nil
 	}

 	return set.NewFromSlice(utils.SplitLines(output))
@@ -75,6 +75,15 @@ var giteaServiceDef = ServiceDefinition{
 	repoURLTemplate:                 defaultRepoURLTemplate,
 }

+var codebergServiceDef = ServiceDefinition{
+	provider:                        "codeberg",
+	pullRequestURLIntoDefaultBranch: "/compare/{{.From}}",
+	pullRequestURLIntoTargetBranch:  "/compare/{{.To}}...{{.From}}",
+	commitURL:                       "/commit/{{.CommitHash}}",
+	regexStrings:                    defaultUrlRegexStrings,
+	repoURLTemplate:                 defaultRepoURLTemplate,
+}
+
 var serviceDefinitions = []ServiceDefinition{
 	githubServiceDef,
 	bitbucketServiceDef,
@@ -82,6 +91,7 @@ var serviceDefinitions = []ServiceDefinition{
 	azdoServiceDef,
 	bitbucketServerServiceDef,
 	giteaServiceDef,
+	codebergServiceDef,
 }

 var defaultServiceDomains = []ServiceDomain{
@@ -110,4 +120,9 @@ var defaultServiceDomains = []ServiceDomain{
 		gitDomain:         "try.gitea.io",
 		webDomain:         "try.gitea.io",
 	},
+	{
+		serviceDefinition: codebergServiceDef,
+		gitDomain:         "codeberg.org",
+		webDomain:         "codeberg.org",
+	},
 }
@@ -421,6 +421,44 @@ func TestGetPullRequestURL(t *testing.T) {
 				assert.Equal(t, "https://mycompany.gitea.io/myproject/myrepo/compare/dev...feature%2Fnew", url)
 			},
 		},
+		{
+			testName:  "Opens a link to new pull request on Codeberg (SSH)",
+			from:      "feature/new",
+			remoteUrl: "git@codeberg.org:johndoe/myrepo.git",
+			test: func(url string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, "https://codeberg.org/johndoe/myrepo/compare/feature%2Fnew", url)
+			},
+		},
+		{
+			testName:  "Opens a link to new pull request on Codeberg (SSH) with specific target",
+			from:      "feature/new",
+			to:        "dev",
+			remoteUrl: "git@codeberg.org:johndoe/myrepo.git",
+			test: func(url string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, "https://codeberg.org/johndoe/myrepo/compare/dev...feature%2Fnew", url)
+			},
+		},
+		{
+			testName:  "Opens a link to new pull request on Codeberg (HTTP)",
+			from:      "feature/new",
+			remoteUrl: "https://codeberg.org/johndoe/myrepo.git",
+			test: func(url string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, "https://codeberg.org/johndoe/myrepo/compare/feature%2Fnew", url)
+			},
+		},
+		{
+			testName:  "Opens a link to new pull request on Codeberg (HTTP) with specific target",
+			from:      "feature/new",
+			to:        "dev",
+			remoteUrl: "https://codeberg.org/johndoe/myrepo.git",
+			test: func(url string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, "https://codeberg.org/johndoe/myrepo/compare/dev...feature%2Fnew", url)
+			},
+		},
 		{
 			testName:  "Throws an error if git service is unsupported",
 			from:      "feature/divide-operation",
@@ -505,7 +543,7 @@ func TestGetPullRequestURL(t *testing.T) {
 				assert.NoError(t, err)
 				assert.Equal(t, "https://bitbucket.org/johndoe/social_network/pull-requests/new?source=feature%2Fprofile-page&t=1", url)
 			},
-			expectedLoggedErrors: []string{"Unknown git service type: 'noservice'. Expected one of github, bitbucket, gitlab, azuredevops, bitbucketServer, gitea"},
+			expectedLoggedErrors: []string{"Unknown git service type: 'noservice'. Expected one of github, bitbucket, gitlab, azuredevops, bitbucketServer, gitea, codeberg"},
 		},
 		{
 			testName:  "Escapes reserved URL characters in from branch name",
@@ -733,6 +733,8 @@ type CustomCommandMenuOption struct {
 	Description string `yaml:"description"`
 	// The value that will be used in the command
 	Value string `yaml:"value" jsonschema:"example=feature,minLength=1"`
+	// Keybinding to invoke this menu option without needing to navigate to it
+	Key string `yaml:"key"`
 }

 type CustomIconsConfig struct {
@@ -136,6 +136,12 @@ func validateCustomCommands(customCommands []CustomCommand) error {
 				return err
 			}
 		} else {
+			for _, prompt := range customCommand.Prompts {
+				if err := validateCustomCommandPrompt(prompt); err != nil {
+					return err
+				}
+			}
+
 			if err := validateEnum("customCommand.output", customCommand.Output,
 				[]string{"", "none", "terminal", "log", "logWithPty", "popup"}); err != nil {
 				return err
@@ -144,3 +150,14 @@ func validateCustomCommands(customCommands []CustomCommand) error {
 	}
 	return nil
 }
+
+func validateCustomCommandPrompt(prompt CustomCommandPrompt) error {
+	for _, option := range prompt.Options {
+		if !isValidKeybindingKey(option.Key) {
+			return fmt.Errorf("Unrecognized key '%s' for custom command prompt option. For permitted values see %s",
+				option.Key, constants.Links.Docs.CustomKeybindings)
+		}
+	}
+
+	return nil
+}
@@ -176,6 +176,31 @@ func TestUserConfigValidate_enums(t *testing.T) {
 				{value: "invalid_value", valid: false},
 			},
 		},
+		{
+			name: "Custom command keybinding in prompt menu",
+			setup: func(config *UserConfig, value string) {
+				config.CustomCommands = []CustomCommand{
+					{
+						Key:         "X",
+						Description: "My Custom Commands",
+						Prompts: []CustomCommandPrompt{
+							{
+								Options: []CustomCommandMenuOption{
+									{Key: value},
+								},
+							},
+						},
+					},
+				}
+			},
+			testCases: []testCase{
+				{value: "", valid: true},
+				{value: "<disabled>", valid: true},
+				{value: "q", valid: true},
+				{value: "<c-c>", valid: true},
+				{value: "invalid_value", valid: false},
+			},
+		},
 		{
 			name: "Custom command output",
 			setup: func(config *UserConfig, value string) {
@@ -196,7 +196,7 @@ func (self *ContextMgr) Activate(c types.Context, opts types.OnFocusOpts) {

 	v.Visible = true

-	self.gui.c.GocuiGui().Cursor = v.Editable && v.Mask == 0
+	self.gui.c.GocuiGui().Cursor = v.Editable && v.Mask == ""

 	c.HandleFocus(opts)
 }
@@ -68,7 +68,8 @@ func NewCommitFilesContext(c *ContextCommon) *CommitFilesContext {
 		},
 	}

-	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(ctx.OnSearchSelect))
+	ctx.GetView().SetRenderSearchStatus(ctx.SearchTrait.RenderSearchStatus)
+	ctx.GetView().SetOnSelectItem(ctx.OnSearchSelect)

 	return ctx
 }
@@ -21,12 +21,23 @@ type ListContextTrait struct {
 	// If this is true, we only render the visible lines of the list. Useful for lists that can
 	// get very long, because it can save a lot of memory
 	renderOnlyVisibleLines bool
+	// If renderOnlyVisibleLines is true, needRerenderVisibleLines indicates whether we need to
+	// rerender the visible lines e.g. because the scroll position changed
+	needRerenderVisibleLines bool
+
+	// true if we're inside the OnSearchSelect call; in that case we don't want to update the search
+	// result index.
+	inOnSearchSelect bool
 }

 func (self *ListContextTrait) IsListContext() {}

-func (self *ListContextTrait) FocusLine() {
-	self.Context.FocusLine()
+func (self *ListContextTrait) FocusLine(scrollIntoView bool) {
+	self.Context.FocusLine(scrollIntoView)
+
+	// Need to capture this in a local variable because by the time the AfterLayout function runs,
+	// the field will have been reset to false already
+	inOnSearchSelect := self.inOnSearchSelect

 	// Doing this at the end of the layout function because we need the view to be
 	// resized before we focus the line, otherwise if we're in accordion mode
@@ -36,7 +47,10 @@ func (self *ListContextTrait) FocusLine() {
 		oldOrigin, _ := self.GetViewTrait().ViewPortYBounds()

 		self.GetViewTrait().FocusPoint(
-			self.ModelIndexToViewIndex(self.list.GetSelectedLineIdx()))
+			self.ModelIndexToViewIndex(self.list.GetSelectedLineIdx()), scrollIntoView)
+		if !inOnSearchSelect {
+			self.GetView().SetNearestSearchPosition()
+		}

 		selectRangeIndex, isSelectingRange := self.list.GetRangeStartIdx()
 		if isSelectingRange {
@@ -50,8 +64,8 @@ func (self *ListContextTrait) FocusLine() {
 			self.refreshViewport()
 		} else if self.renderOnlyVisibleLines {
 			newOrigin, _ := self.GetViewTrait().ViewPortYBounds()
-			if oldOrigin != newOrigin {
-				self.HandleRender()
+			if oldOrigin != newOrigin || self.needRerenderVisibleLines {
+				self.refreshViewport()
 			}
 		}
 		return nil
@@ -75,7 +89,7 @@ func formatListFooter(selectedLineIdx int, length int) string {
 }

 func (self *ListContextTrait) HandleFocus(opts types.OnFocusOpts) {
-	self.FocusLine()
+	self.FocusLine(opts.ScrollSelectionIntoView)

 	self.GetViewTrait().SetHighlight(self.list.Len() > 0)

@@ -102,10 +116,10 @@ func (self *ListContextTrait) HandleRender() {
 		if self.getNonModelItems != nil {
 			totalLength += len(self.getNonModelItems())
 		}
-		self.GetViewTrait().SetContentLineCount(totalLength)
 		startIdx, length := self.GetViewTrait().ViewPortYBounds()
 		content := self.renderLines(startIdx, startIdx+length)
-		self.GetViewTrait().SetViewPortContentAndClearEverythingElse(content)
+		self.GetViewTrait().SetViewPortContentAndClearEverythingElse(totalLength, content)
+		self.needRerenderVisibleLines = false
 	} else {
 		content := self.renderLines(-1, -1)
 		self.GetViewTrait().SetContent(content)
@@ -114,10 +128,11 @@ func (self *ListContextTrait) HandleRender() {
 	self.setFooter()
 }

-func (self *ListContextTrait) OnSearchSelect(selectedLineIdx int) error {
+func (self *ListContextTrait) OnSearchSelect(selectedLineIdx int) {
 	self.GetList().SetSelection(self.ViewIndexToModelIndex(selectedLineIdx))
+	self.inOnSearchSelect = true
 	self.HandleFocus(types.OnFocusOpts{})
-	return nil
+	self.inOnSearchSelect = false
 }

 func (self *ListContextTrait) IsItemVisible(item types.HasUrn) bool {
@@ -142,6 +157,10 @@ func (self *ListContextTrait) RenderOnlyVisibleLines() bool {
 	return self.renderOnlyVisibleLines
 }

+func (self *ListContextTrait) SetNeedRerenderVisibleLines() {
+	self.needRerenderVisibleLines = true
+}
+
 func (self *ListContextTrait) TotalContentHeight() int {
 	result := self.list.Len()
 	if self.getNonModelItems != nil {
@@ -134,7 +134,8 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
 		},
 	}

-	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(ctx.OnSearchSelect))
+	ctx.GetView().SetRenderSearchStatus(ctx.SearchTrait.RenderSearchStatus)
+	ctx.GetView().SetOnSelectItem(ctx.OnSearchSelect)

 	return ctx
 }
@@ -31,7 +31,8 @@ func NewMainContext(
 		SearchTrait: NewSearchTrait(c),
 	}

-	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(func(int) error { return nil }))
+	ctx.GetView().SetRenderSearchStatus(ctx.SearchTrait.RenderSearchStatus)
+	ctx.GetView().SetOnSelectItem(func(int) {})

 	return ctx
 }
@@ -56,6 +56,7 @@ type MenuViewModel struct {
 	promptLines               []string
 	columnAlignment           []utils.Alignment
 	allowFilteringKeybindings bool
+	keybindingsTakePrecedence bool
 	*FilteredListViewModel[*types.MenuItem]
 }

@@ -117,6 +118,10 @@ func (self *MenuViewModel) SetAllowFilteringKeybindings(allow bool) {
 	self.allowFilteringKeybindings = allow
 }

+func (self *MenuViewModel) SetKeybindingsTakePrecedence(value bool) {
+	self.keybindingsTakePrecedence = value
+}
+
 // TODO: move into presentation package
 func (self *MenuViewModel) GetDisplayStrings(_ int, _ int) [][]string {
 	menuItems := self.FilteredListViewModel.GetItems()
@@ -205,10 +210,19 @@ func (self *MenuContext) GetKeybindings(opts types.KeybindingsOpts) []*types.Bin
 		}
 	})

-	// appending because that means the menu item bindings have lower precedence.
-	// So if a basic binding is to escape from the menu, we want that to still be
-	// what happens when you press escape. This matters when we're showing the menu
-	// for all keybindings of say the files context.
+	if self.keybindingsTakePrecedence {
+		// This is used for all normal menus except the keybindings menu. In this case we want the
+		// bindings of the menu items to have higher precedence than the builtin bindings; this
+		// allows assigning a keybinding to a menu item that overrides a non-essential binding such
+		// as 'j', 'k', 'H', 'L', etc. This is safe to do because the essential bindings such as
+		// confirm and return have already been removed from the menu items in this case.
+		return append(menuItemBindings, basicBindings...)
+	}
+
+	// For the keybindings menu we didn't remove the essential bindings from the menu items, because
+	// it is important to see all bindings (as a cheat sheet for what the keys are when the menu is
+	// not open). Therefore we want the essential bindings to have higher precedence than the menu
+	// item bindings.
 	return append(basicBindings, menuItemBindings...)
 }

@@ -16,6 +16,10 @@ type PatchExplorerContext struct {
 	getIncludedLineIndices func() []int
 	c                      *ContextCommon
 	mutex                  deadlock.Mutex
+
+	// true if we're inside the OnSelectItem callback; in that case we don't want to update the
+	// search result index.
+	inOnSelectItemCallback bool
 }

 var (
@@ -49,14 +53,14 @@ func NewPatchExplorerContext(
 		SearchTrait: NewSearchTrait(c),
 	}

-	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(
-		func(selectedLineIdx int) error {
-			ctx.GetMutex().Lock()
-			defer ctx.GetMutex().Unlock()
-			ctx.NavigateTo(selectedLineIdx)
-			return nil
-		}),
-	)
+	ctx.GetView().SetRenderSearchStatus(ctx.SearchTrait.RenderSearchStatus)
+	ctx.GetView().SetOnSelectItem(func(selectedLineIdx int) {
+		ctx.GetMutex().Lock()
+		defer ctx.GetMutex().Unlock()
+		ctx.inOnSelectItemCallback = true
+		ctx.NavigateTo(selectedLineIdx)
+		ctx.inOnSelectItemCallback = false
+	})

 	ctx.SetHandleRenderFunc(ctx.OnViewWidthChanged)

@@ -113,6 +117,10 @@ func (self *PatchExplorerContext) FocusSelection() {
 	// As far as the view is concerned, we are always selecting a range
 	view.SetRangeSelectStart(startIdx)
 	view.SetCursorY(endIdx - newOriginY)
+
+	if !self.inOnSelectItemCallback {
+		view.SetNearestSearchPosition()
+	}
 }

 func (self *PatchExplorerContext) GetContentToRender() string {
@@ -26,9 +26,14 @@ func NewReflogCommitsContext(c *ContextCommon) *ReflogCommitsContext {
 		},
 	)

-	getDisplayStrings := func(_ int, _ int) [][]string {
+	getDisplayStrings := func(startIdx int, endIdx int) [][]string {
+		commits := viewModel.GetItems()
+		if startIdx >= len(commits) {
+			return nil
+		}
+
 		return presentation.GetReflogCommitListDisplayStrings(
-			viewModel.GetItems(),
+			commits[startIdx:endIdx],
 			c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL,
 			c.Modes().CherryPicking.SelectedHashSet(),
 			c.Modes().Diffing.Ref,
@@ -43,18 +48,20 @@ func NewReflogCommitsContext(c *ContextCommon) *ReflogCommitsContext {
 		FilteredListViewModel: viewModel,
 		ListContextTrait: &ListContextTrait{
 			Context: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
-				View:                       c.Views().ReflogCommits,
-				WindowName:                 "commits",
-				Key:                        REFLOG_COMMITS_CONTEXT_KEY,
-				Kind:                       types.SIDE_CONTEXT,
-				Focusable:                  true,
-				NeedsRerenderOnWidthChange: types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_SCREEN_MODE_CHANGES,
+				View:                        c.Views().ReflogCommits,
+				WindowName:                  "commits",
+				Key:                         REFLOG_COMMITS_CONTEXT_KEY,
+				Kind:                        types.SIDE_CONTEXT,
+				Focusable:                   true,
+				NeedsRerenderOnWidthChange:  types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_SCREEN_MODE_CHANGES,
+				NeedsRerenderOnHeightChange: true,
 			})),
 			ListRenderer: ListRenderer{
 				list:              viewModel,
 				getDisplayStrings: getDisplayStrings,
 			},
-			c: c,
+			c:                      c,
+			renderOnlyVisibleLines: true,
 		},
 	}
 }
@@ -36,20 +36,6 @@ func (self *SearchTrait) ClearSearchString() {
 // used for type switch
 func (self *SearchTrait) IsSearchableContext() {}

-func (self *SearchTrait) onSelectItemWrapper(innerFunc func(int) error) func(int, int, int) error {
-	return func(selectedLineIdx int, index int, total int) error {
-		self.RenderSearchStatus(index, total)
-
-		if total != 0 {
-			if err := innerFunc(selectedLineIdx); err != nil {
-				return err
-			}
-		}
-
-		return nil
-	}
-}
-
 func (self *SearchTrait) RenderSearchStatus(index int, total int) {
 	keybindingConfig := self.c.UserConfig().Keybinding

@@ -54,7 +54,7 @@ func (self *SimpleContext) HandleFocusLost(opts types.OnFocusLostOpts) {
 	}
 }

-func (self *SimpleContext) FocusLine() {
+func (self *SimpleContext) FocusLine(scrollIntoView bool) {
 }

 func (self *SimpleContext) HandleRender() {
@@ -134,7 +134,8 @@ func NewSubCommitsContext(
 		},
 	}

-	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(ctx.OnSearchSelect))
+	ctx.GetView().SetRenderSearchStatus(ctx.SearchTrait.RenderSearchStatus)
+	ctx.GetView().SetOnSelectItem(ctx.OnSearchSelect)

 	return ctx
 }
@@ -17,8 +17,8 @@ func NewViewTrait(view *gocui.View) *ViewTrait {
 	return &ViewTrait{view: view}
 }

-func (self *ViewTrait) FocusPoint(yIdx int) {
-	self.view.FocusPoint(self.view.OriginX(), yIdx)
+func (self *ViewTrait) FocusPoint(yIdx int, scrollIntoView bool) {
+	self.view.FocusPoint(self.view.OriginX(), yIdx, scrollIntoView)
 }

 func (self *ViewTrait) SetRangeSelectStart(yIdx int) {
@@ -34,13 +34,9 @@ func (self *ViewTrait) SetViewPortContent(content string) {
 	self.view.OverwriteLines(y, content)
 }

-func (self *ViewTrait) SetViewPortContentAndClearEverythingElse(content string) {
+func (self *ViewTrait) SetViewPortContentAndClearEverythingElse(lineCount int, content string) {
 	_, y := self.view.Origin()
-	self.view.OverwriteLinesAndClearEverythingElse(y, content)
-}
-
-func (self *ViewTrait) SetContentLineCount(lineCount int) {
-	self.view.SetContentLineCount(lineCount)
+	self.view.OverwriteLinesAndClearEverythingElse(lineCount, y, content)
 }

 func (self *ViewTrait) SetContent(content string) {
@@ -56,7 +56,8 @@ func NewWorkingTreeContext(c *ContextCommon) *WorkingTreeContext {
 		},
 	}

-	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(ctx.OnSearchSelect))
+	ctx.GetView().SetRenderSearchStatus(ctx.SearchTrait.RenderSearchStatus)
+	ctx.GetView().SetOnSelectItem(ctx.OnSearchSelect)

 	return ctx
 }
@@ -531,7 +531,7 @@ func (self *BranchesController) createNewBranchWithName(newBranchName string) er
 		return err
 	}

-	self.context().SetSelection(0)
+	self.c.Helpers().Refs.SelectFirstBranchAndFirstCommit()
 	self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, KeepBranchSelectionIndex: true})
 	return nil
 }
@@ -12,6 +12,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
 	"github.com/jesseduffield/lazygit/pkg/constants"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
+	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/filetree"
 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
@@ -283,6 +284,12 @@ func (self *CommitFilesController) openCopyMenu() error {
 }

 func (self *CommitFilesController) checkout(node *filetree.CommitFileNode) error {
+	hasModifiedFiles := helpers.AnyTrackedFilesInPathExceptSubmodules(node.GetPath(),
+		self.c.Model().Files, self.c.Model().Submodules)
+	if hasModifiedFiles {
+		return errors.New(self.c.Tr.CannotCheckoutWithModifiedFilesErr)
+	}
+
 	self.c.LogAction(self.c.Tr.Actions.CheckoutFile)
 	_, to := self.context().GetFromAndToForDiff()
 	if err := self.c.Git().WorkingTree.CheckoutFile(to, node.GetPath()); err != nil {
@@ -585,7 +585,7 @@ func (self *FilesController) handleNonInlineConflict(file *models.File) error {
 		OnPress: func() error {
 			return handle(self.c.Git().WorkingTree.StageFile, self.c.Tr.Actions.ResolveConflictByKeepingFile)
 		},
-		Key: 'p',
+		Key: 'k',
 	}
 	deleteItem := &types.MenuItem{
 		Label: self.c.Tr.MergeConflictDeleteFile,
@@ -101,7 +101,7 @@ func (self *CherryPickHelper) Paste() error {
 				// below the selection.
 				if commit := self.c.Contexts().LocalCommits.GetSelected(); commit != nil && !commit.IsTODO() {
 					self.c.Contexts().LocalCommits.MoveSelection(len(cherryPickedCommits))
-					self.c.Contexts().LocalCommits.FocusLine()
+					self.c.Contexts().LocalCommits.FocusLine(true)
 				}

 				// If we're in the cherry-picking state at this point, it must
@@ -61,28 +61,25 @@ func (self *CommitsHelper) JoinCommitMessageAndUnwrappedDescription() string {
 }

 func TryRemoveHardLineBreaks(message string, autoWrapWidth int) string {
-	messageRunes := []rune(message)
 	lastHardLineStart := 0
-	for i, r := range messageRunes {
-		if r == '\n' {
+	result := message
+	for i, b := range message {
+		if b == '\n' {
 			// Try to make this a soft linebreak by turning it into a space, and
 			// checking whether it still wraps to the same result then.
-			messageRunes[i] = ' '
+			str := message[lastHardLineStart:i] + " " + message[i+1:]
+			softLineBreakIndices := gocui.AutoWrapContent(str, autoWrapWidth)

-			_, cursorMapping := gocui.AutoWrapContent(messageRunes[lastHardLineStart:], autoWrapWidth)
-
-			// Look at the cursorMapping to check whether auto-wrapping inserted
-			// a line break. If it did, there will be a cursorMapping entry with
-			// Orig pointing to the position after the inserted line break.
-			if len(cursorMapping) == 0 || cursorMapping[0].Orig != i-lastHardLineStart+1 {
-				// It didn't, so change it back to a newline
-				messageRunes[i] = '\n'
+			// See if auto-wrapping inserted a soft line break:
+			if len(softLineBreakIndices) > 0 && softLineBreakIndices[0] == i-lastHardLineStart+1 {
+				// It did, so change it to a space in the result.
+				result = result[:i] + " " + result[i+1:]
 			}
 			lastHardLineStart = i + 1
 		}
 	}

-	return string(messageRunes)
+	return result
 }

 func (self *CommitsHelper) SwitchToEditor() error {
@@ -152,7 +152,7 @@ func (self *ConfirmationHelper) preparePromptPanel(
 ) {
 	self.c.Views().Prompt.Title = opts.Title
 	self.c.Views().Prompt.FgColor = theme.GocuiDefaultTextColor
-	self.c.Views().Prompt.Mask = runeForMask(opts.Mask)
+	self.c.Views().Prompt.Mask = characterForMask(opts.Mask)
 	self.c.Views().Prompt.SetOrigin(0, 0)

 	textArea := self.c.Views().Prompt.TextArea
@@ -173,11 +173,11 @@ func (self *ConfirmationHelper) preparePromptPanel(
 	}
 }

-func runeForMask(mask bool) rune {
+func characterForMask(mask bool) string {
 	if mask {
-		return '*'
+		return "*"
 	}
-	return 0
+	return ""
 }

 func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts types.CreatePopupPanelOpts) {
@@ -31,6 +31,15 @@ func NewRefsHelper(
 	}
 }

+func (self *RefsHelper) SelectFirstBranchAndFirstCommit() {
+	self.c.Contexts().Branches.SetSelection(0)
+	self.c.Contexts().ReflogCommits.SetSelection(0)
+	self.c.Contexts().LocalCommits.SetSelection(0)
+	self.c.Contexts().Branches.GetView().SetOriginY(0)
+	self.c.Contexts().ReflogCommits.GetView().SetOriginY(0)
+	self.c.Contexts().LocalCommits.GetView().SetOriginY(0)
+}
+
 func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions) error {
 	waitingStatus := options.WaitingStatus
 	if waitingStatus == "" {
@@ -40,9 +49,8 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions
 	cmdOptions := git_commands.CheckoutOptions{Force: false, EnvVars: options.EnvVars}

 	refresh := func() {
-		self.c.Contexts().Branches.SetSelection(0)
-		self.c.Contexts().ReflogCommits.SetSelection(0)
-		self.c.Contexts().LocalCommits.SetSelection(0)
+		self.SelectFirstBranchAndFirstCommit()
+
 		// loading a heap of commits is slow so we limit them whenever doing a reset
 		self.c.Contexts().LocalCommits.SetLimitCommits(true)

@@ -348,8 +356,7 @@ func (self *RefsHelper) NewBranch(from string, fromFormattedName string, suggest
 			self.c.Context().Push(self.c.Contexts().Branches, types.OnFocusOpts{})
 		}

-		self.c.Contexts().LocalCommits.SetSelection(0)
-		self.c.Contexts().Branches.SetSelection(0)
+		self.SelectFirstBranchAndFirstCommit()

 		self.c.Refresh(types.RefreshOptions{Mode: types.BLOCK_UI, KeepBranchSelectionIndex: true})
 	}
@@ -504,8 +511,7 @@ func (self *RefsHelper) moveCommitsToNewBranchStackedOnCurrentBranch(newBranchNa
 		}
 	}

-	self.c.Contexts().LocalCommits.SetSelection(0)
-	self.c.Contexts().Branches.SetSelection(0)
+	self.SelectFirstBranchAndFirstCommit()

 	self.c.Refresh(types.RefreshOptions{Mode: types.BLOCK_UI, KeepBranchSelectionIndex: true})
 	return nil
@@ -543,8 +549,7 @@ func (self *RefsHelper) moveCommitsToNewBranchOffOfMainBranch(newBranchName stri
 		}
 	}

-	self.c.Contexts().LocalCommits.SetSelection(0)
-	self.c.Contexts().Branches.SetSelection(0)
+	self.SelectFirstBranchAndFirstCommit()

 	self.c.Refresh(types.RefreshOptions{Mode: types.BLOCK_UI, KeepBranchSelectionIndex: true})
 	return nil
@@ -108,20 +108,15 @@ func (self *SearchHelper) Confirm() error {
 		return self.CancelPrompt()
 	}

-	var err error
 	switch state.SearchType() {
 	case types.SearchTypeFilter:
 		self.ConfirmFilter()
 	case types.SearchTypeSearch:
-		err = self.ConfirmSearch()
+		self.ConfirmSearch()
 	case types.SearchTypeNone:
 		self.c.Context().Pop()
 	}

-	if err != nil {
-		return err
-	}
-
 	return self.c.ResetKeybindings()
 }

@@ -144,13 +139,13 @@ func (self *SearchHelper) ConfirmFilter() {
 	self.c.Context().Pop()
 }

-func (self *SearchHelper) ConfirmSearch() error {
+func (self *SearchHelper) ConfirmSearch() {
 	state := self.searchState()

 	context, ok := state.Context.(types.ISearchableContext)
 	if !ok {
 		self.c.Log.Warnf("Context %s is searchable", state.Context.GetKey())
-		return nil
+		return
 	}

 	searchString := self.promptContent()
@@ -161,7 +156,7 @@ func (self *SearchHelper) ConfirmSearch() error {

 	self.c.Context().Pop()

-	return context.GetView().Search(searchString, modelSearchResults(context))
+	context.GetView().Search(searchString, modelSearchResults(context))
 }

 func modelSearchResults(context types.ISearchableContext) []gocui.SearchPosition {
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"regexp"
+	"strings"

 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
@@ -71,6 +72,23 @@ func AnyTrackedFilesExceptSubmodules(files []*models.File, submoduleConfigs []*m
 	return lo.SomeBy(files, func(f *models.File) bool { return f.Tracked && !f.IsSubmodule(submoduleConfigs) })
 }

+func isContainedInPath(candidate string, path string) bool {
+	return (
+	// If the path is the repo root (appears as "/" in the UI), then all candidates are contained in it
+	path == "." ||
+		// Exact match; will only be true for files
+		candidate == path ||
+		// Match for files within a directory. We need to match the trailing slash to avoid
+		// matching files with longer names.
+		strings.HasPrefix(candidate, path+"/"))
+}
+
+func AnyTrackedFilesInPathExceptSubmodules(path string, files []*models.File, submoduleConfigs []*models.SubmoduleConfig) bool {
+	return lo.SomeBy(files, func(f *models.File) bool {
+		return f.Tracked && isContainedInPath(f.GetPath(), path) && !f.IsSubmodule(submoduleConfigs)
+	})
+}
+
 func (self *WorkingTreeHelper) IsWorkingTreeDirtyExceptSubmodules() bool {
 	return IsWorkingTreeDirtyExceptSubmodules(self.c.Model().Files, self.c.Model().Submodules)
 }
@@ -90,18 +108,10 @@ func (self *WorkingTreeHelper) FileForSubmodule(submodule *models.SubmoduleConfi
 }

 func (self *WorkingTreeHelper) OpenMergeTool() error {
-	self.c.Confirm(types.ConfirmOpts{
-		Title:  self.c.Tr.MergeToolTitle,
-		Prompt: self.c.Tr.MergeToolPrompt,
-		HandleConfirm: func() error {
-			self.c.LogAction(self.c.Tr.Actions.OpenMergeTool)
-			return self.c.RunSubprocessAndRefresh(
-				self.c.Git().WorkingTree.OpenMergeToolCmdObj(),
-			)
-		},
-	})
-
-	return nil
+	self.c.LogAction(self.c.Tr.Actions.OpenMergeTool)
+	return self.c.RunSubprocessAndRefresh(
+		self.c.Git().WorkingTree.OpenMergeToolCmdObj(),
+	)
 }

 func (self *WorkingTreeHelper) HandleCommitPressWithMessage(initialMessage string, forceSkipHooks bool) error {
@@ -116,7 +116,12 @@ func (self *ListController) handleLineChangeAux(f func(int), change int) error {
 	}

 	if cursorMoved || rangeBefore != rangeAfter {
-		self.context.HandleFocus(types.OnFocusOpts{})
+		self.context.HandleFocus(types.OnFocusOpts{ScrollSelectionIntoView: true})
+	} else {
+		// If the selection did not change (because, for example, we are at the top of the list and
+		// press up), we still want to ensure that the selection is visible. This is useful after
+		// scrolling the selection out of view with the mouse.
+		self.context.FocusLine(true)
 	}

 	return nil
@@ -173,6 +178,15 @@ func (self *ListController) handlePageChange(delta int) error {
 		}
 	}

+	// Since we already scrolled the view above, the normal mechanism that
+	// ListContextTrait.FocusLine uses for deciding whether rerendering is needed won't work. It is
+	// based on checking whether the origin was changed by the call to FocusPoint in that function,
+	// but since we scrolled the view directly above, the origin has already been updated. So we
+	// must tell it explicitly to rerender.
+	self.context.SetNeedRerenderVisibleLines()
+
+	// Since we are maintaining the scroll position ourselves above, there's no point in passing
+	// ScrollSelectionIntoView=true here.
 	self.context.HandleFocus(types.OnFocusOpts{})

 	return nil
@@ -869,7 +869,7 @@ func (self *LocalCommitsController) revert(commits []*models.Commit, start, end
 					return err
 				}
 				self.context().MoveSelection(len(commits))
-				self.context().FocusLine()
+				self.context().HandleFocus(types.OnFocusOpts{ScrollSelectionIntoView: true})

 				if mustStash {
 					if err := self.c.Git().Stash.Pop(0); err != nil {
@@ -46,12 +46,12 @@ func (self *OptionsMenuAction) Call() error {
 	appendBindings(navigation, &types.MenuSection{Title: self.c.Tr.KeybindingsMenuSectionNavigation, Column: 1})

 	return self.c.Menu(types.CreateMenuOptions{
-		Title:                     self.c.Tr.Keybindings,
-		Items:                     menuItems,
-		HideCancel:                true,
-		ColumnAlignment:           []utils.Alignment{utils.AlignRight, utils.AlignLeft},
-		AllowFilteringKeybindings: true,
-		KeepConfirmKeybindings:    true,
+		Title:                      self.c.Tr.Keybindings,
+		Items:                      menuItems,
+		HideCancel:                 true,
+		ColumnAlignment:            []utils.Alignment{utils.AlignRight, utils.AlignLeft},
+		AllowFilteringKeybindings:  true,
+		KeepConflictingKeybindings: true,
 	})
 }

@@ -368,7 +368,7 @@ func (self *RemotesController) fetchAndCheckout(remote *models.Remote, branchNam
 			err = self.c.Git().Branch.New(branchName, remote.Name+"/"+branchName)
 			if err == nil {
 				self.c.Context().Push(self.c.Contexts().Branches, types.OnFocusOpts{})
-				self.c.Contexts().Branches.SetSelection(0)
+				self.c.Helpers().Refs.SelectFirstBranchAndFirstCommit()
 				refreshOptions.KeepBranchSelectionIndex = true
 			}
 		}
@@ -205,7 +205,7 @@ func (self *StashController) handleRenameStashEntry(stashEntry *models.StashEntr
 				return err
 			}
 			self.context().SetSelection(0) // Select the renamed stash
-			self.context().FocusLine()
+			self.context().FocusLine(true)
 			self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.STASH}})
 			return nil
 		},
@@ -1,79 +1,36 @@
 package gui

 import (
-	"unicode"
-
 	"github.com/jesseduffield/gocui"
 )

-func (gui *Gui) handleEditorKeypress(textArea *gocui.TextArea, key gocui.Key, ch rune, mod gocui.Modifier, allowMultiline bool) bool {
-	switch {
-	case (key == gocui.KeyBackspace || key == gocui.KeyBackspace2) && (mod&gocui.ModAlt) != 0,
-		key == gocui.KeyCtrlW:
-		textArea.BackSpaceWord()
-	case key == gocui.KeyBackspace || key == gocui.KeyBackspace2:
-		textArea.BackSpaceChar()
-	case key == gocui.KeyCtrlD || key == gocui.KeyDelete:
-		textArea.DeleteChar()
-	case key == gocui.KeyArrowDown:
-		textArea.MoveCursorDown()
-	case key == gocui.KeyArrowUp:
-		textArea.MoveCursorUp()
-	case (key == gocui.KeyArrowLeft || ch == 'b') && (mod&gocui.ModAlt) != 0:
-		textArea.MoveLeftWord()
-	case key == gocui.KeyArrowLeft || key == gocui.KeyCtrlB:
-		textArea.MoveCursorLeft()
-	case (key == gocui.KeyArrowRight || ch == 'f') && (mod&gocui.ModAlt) != 0:
-		textArea.MoveRightWord()
-	case key == gocui.KeyArrowRight || key == gocui.KeyCtrlF:
-		textArea.MoveCursorRight()
-	case key == gocui.KeyEnter:
-		if allowMultiline {
-			textArea.TypeRune('\n')
-		} else {
-			return false
-		}
-	case key == gocui.KeySpace:
-		textArea.TypeRune(' ')
-	case key == gocui.KeyInsert:
-		textArea.ToggleOverwrite()
-	case key == gocui.KeyCtrlU:
-		textArea.DeleteToStartOfLine()
-	case key == gocui.KeyCtrlK:
-		textArea.DeleteToEndOfLine()
-	case key == gocui.KeyCtrlA || key == gocui.KeyHome:
-		textArea.GoToStartOfLine()
-	case key == gocui.KeyCtrlE || key == gocui.KeyEnd:
-		textArea.GoToEndOfLine()
-	case key == gocui.KeyCtrlY:
-		textArea.Yank()
-
-	case unicode.IsPrint(ch):
-		textArea.TypeRune(ch)
-	default:
-		return false
+func (gui *Gui) handleEditorKeypress(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier, allowMultiline bool) bool {
+	if key == gocui.KeyEnter && allowMultiline {
+		v.TextArea.TypeCharacter("\n")
+		v.RenderTextArea()
+		return true
 	}

-	return true
+	return gocui.DefaultEditor.Edit(v, key, ch, mod)
 }

 // we've just copy+pasted the editor from gocui to here so that we can also re-
 // render the commit message length on each keypress
 func (gui *Gui) commitMessageEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool {
-	matched := gui.handleEditorKeypress(v.TextArea, key, ch, mod, false)
+	matched := gui.handleEditorKeypress(v, key, ch, mod, false)
 	v.RenderTextArea()
 	gui.c.Contexts().CommitMessage.RenderSubtitle()
 	return matched
 }

 func (gui *Gui) commitDescriptionEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool {
-	matched := gui.handleEditorKeypress(v.TextArea, key, ch, mod, true)
+	matched := gui.handleEditorKeypress(v, key, ch, mod, true)
 	v.RenderTextArea()
 	return matched
 }

 func (gui *Gui) promptEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool {
-	matched := gui.handleEditorKeypress(v.TextArea, key, ch, mod, false)
+	matched := gui.handleEditorKeypress(v, key, ch, mod, false)

 	v.RenderTextArea()

@@ -90,7 +47,7 @@ func (gui *Gui) promptEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Mo
 }

 func (gui *Gui) searchEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool {
-	matched := gui.handleEditorKeypress(v.TextArea, key, ch, mod, false)
+	matched := gui.handleEditorKeypress(v, key, ch, mod, false)
 	v.RenderTextArea()

 	searchString := v.TextArea.GetContent()
@@ -14,6 +14,7 @@ func (gui *Gui) handleCreateExtrasMenuPanel() error {
 		Items: []*types.MenuItem{
 			{
 				Label: gui.c.Tr.ToggleShowCommandLog,
+				Key:   't',
 				OnPress: func() error {
 					currentContext := gui.c.Context().CurrentStatic()
 					if gui.c.State().GetShowExtrasWindow() && currentContext.GetKey() == context.COMMAND_LOG_CONTEXT_KEY {
@@ -28,6 +29,7 @@ func (gui *Gui) handleCreateExtrasMenuPanel() error {
 			},
 			{
 				Label:   gui.c.Tr.FocusCommandLog,
+				Key:     'f',
 				OnPress: gui.handleFocusCommandLog,
 			},
 		},
@@ -6,6 +6,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/theme"
+	"github.com/samber/lo"
 )

 // note: items option is mutated by this function
@@ -21,7 +22,13 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error {
 	}

 	maxColumnSize := 1
-	confirmKey := keybindings.GetKey(gui.c.UserConfig().Keybinding.Universal.ConfirmMenu)
+
+	essentialKeys := []types.Key{
+		keybindings.GetKey(gui.c.UserConfig().Keybinding.Universal.ConfirmMenu),
+		keybindings.GetKey(gui.c.UserConfig().Keybinding.Universal.Return),
+		keybindings.GetKey(gui.c.UserConfig().Keybinding.Universal.PrevItem),
+		keybindings.GetKey(gui.c.UserConfig().Keybinding.Universal.NextItem),
+	}

 	for _, item := range opts.Items {
 		if item.LabelColumns == nil {
@@ -34,8 +41,8 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error {

 		maxColumnSize = max(maxColumnSize, len(item.LabelColumns))

-		// Remove all item keybindings that are the same as the confirm binding
-		if item.Key == confirmKey && !opts.KeepConfirmKeybindings {
+		// Remove all item keybindings that are the same as one of the essential bindings
+		if !opts.KeepConflictingKeybindings && lo.Contains(essentialKeys, item.Key) {
 			item.Key = nil
 		}
 	}
@@ -51,6 +58,7 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error {
 	gui.State.Contexts.Menu.SetMenuItems(opts.Items, opts.ColumnAlignment)
 	gui.State.Contexts.Menu.SetPrompt(opts.Prompt)
 	gui.State.Contexts.Menu.SetAllowFilteringKeybindings(opts.AllowFilteringKeybindings)
+	gui.State.Contexts.Menu.SetKeybindingsTakePrecedence(!opts.KeepConflictingKeybindings)
 	gui.State.Contexts.Menu.SetSelection(0)

 	gui.Views.Menu.Title = opts.Title
@@ -8,7 +8,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/lucasb-eyer/go-colorful"
-	"github.com/mattn/go-runewidth"
+	"github.com/rivo/uniseg"
 )

 type authorNameCacheKey struct {
@@ -114,9 +114,9 @@ func getInitials(authorName string) string {
 		return authorName
 	}

-	firstRune := getFirstRune(authorName)
-	if runewidth.RuneWidth(firstRune) > 1 {
-		return string(firstRune)
+	firstChar, _, width, _ := uniseg.FirstGraphemeClusterInString(authorName, -1)
+	if width > 1 {
+		return firstChar
 	}

 	split := strings.Split(authorName, " ")
@@ -127,15 +127,6 @@ func getInitials(authorName string) string {
 	return utils.LimitStr(split[0], 1) + utils.LimitStr(split[1], 1)
 }

-func getFirstRune(str string) rune {
-	// just using the loop for the sake of getting the first rune
-	for _, r := range str {
-		return r
-	}
-	// should never land here
-	return 0
-}
-
 func SetCustomAuthors(customAuthorColors map[string]string) {
 	authorStyleCache = utils.SetCustomColors(customAuthorColors)
 }
@@ -15,7 +15,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/jesseduffield/lazygit/pkg/theme"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/mattn/go-runewidth"
 	"github.com/samber/lo"
 )

@@ -95,7 +94,7 @@ func getBranchDisplayStrings(
 	if utils.StringWidth(displayName) > max(availableWidth, 3) {
 		// Never shorten the branch name to less then 3 characters
 		len := max(availableWidth, 4)
-		displayName = runewidth.Truncate(displayName, len, "…")
+		displayName = utils.TruncateWithEllipsis(displayName, len)
 	}
 	coloredName := nameTextStyle.Sprint(displayName)
 	if checkedOutByWorkTree {
@@ -483,6 +483,8 @@ func getHashColor(
 	diffed := commit.Hash() != "" && commit.Hash() == diffName
 	hashColor := theme.DefaultTextColor
 	switch commit.Status {
+	case models.StatusNone:
+		hashColor = style.FgMagenta // or style.FgCyan
 	case models.StatusUnpushed:
 		hashColor = style.FgRed
 	case models.StatusPushed:
@@ -493,7 +495,6 @@ func getHashColor(
 		hashColor = style.FgBlue
 	case models.StatusReflog:
 		hashColor = style.FgBlue
-	default:
 	}

 	if diffed {
@@ -9,6 +9,7 @@ import (
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
+	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"
@@ -203,6 +204,7 @@ func (self *HandlerCreator) menuPrompt(prompt *config.CustomCommandPrompt, wrapp
 			OnPress: func() error {
 				return wrappedF(option.Value)
 			},
+			Key: keybindings.GetKey(option.Key),
 		}
 	})

@@ -108,6 +108,7 @@ func (self *Resolver) resolveMenuOption(option *config.CustomCommandMenuOption,
 		Name:        name,
 		Description: description,
 		Value:       value,
+		Key:         option.Key,
 	}, nil
 }

@@ -150,13 +150,13 @@ const (
 )

 type CreateMenuOptions struct {
-	Title                     string
-	Prompt                    string // a message that will be displayed above the menu options
-	Items                     []*MenuItem
-	HideCancel                bool
-	ColumnAlignment           []utils.Alignment
-	AllowFilteringKeybindings bool
-	KeepConfirmKeybindings    bool // if true, the keybindings that match the confirm binding will not be removed from menu items
+	Title                      string
+	Prompt                     string // a message that will be displayed above the menu options
+	Items                      []*MenuItem
+	HideCancel                 bool
+	ColumnAlignment            []utils.Alignment
+	AllowFilteringKeybindings  bool
+	KeepConflictingKeybindings bool // if true, the keybindings that match essential bindings such as confirm or return will not be removed from menu items
 }

 type CreatePopupPanelOpts struct {
@@ -109,7 +109,7 @@ type Context interface {

 	HandleFocus(opts OnFocusOpts)
 	HandleFocusLost(opts OnFocusLostOpts)
-	FocusLine()
+	FocusLine(scrollIntoView bool)
 	HandleRender()
 	HandleRenderToMain()
 }
@@ -182,6 +182,7 @@ type IListContext interface {
 	IsListContext() // used for type switch
 	RangeSelectEnabled() bool
 	RenderOnlyVisibleLines() bool
+	SetNeedRerenderVisibleLines()

 	IndexForGotoBottom() int
 }
@@ -201,12 +202,11 @@ type IPatchExplorerContext interface {
 }

 type IViewTrait interface {
-	FocusPoint(yIdx int)
+	FocusPoint(yIdx int, scrollIntoView bool)
 	SetRangeSelectStart(yIdx int)
 	CancelRangeSelect()
 	SetViewPortContent(content string)
-	SetViewPortContentAndClearEverythingElse(content string)
-	SetContentLineCount(lineCount int)
+	SetViewPortContentAndClearEverythingElse(lineCount int, content string)
 	SetContent(content string)
 	SetFooter(value string)
 	SetOriginX(value int)
@@ -221,8 +221,9 @@ type IViewTrait interface {
 }

 type OnFocusOpts struct {
-	ClickedWindowName  string
-	ClickedViewLineIdx int
+	ClickedWindowName       string
+	ClickedViewLineIdx      int
+	ScrollSelectionIntoView bool
 }

 type OnFocusLostOpts struct {
@@ -140,7 +140,7 @@ func (gui *Gui) postRefreshUpdate(c types.Context) {
 		// non-focused views to ensure that an inactive selection is painted
 		// correctly, and that integration tests see the up to date selection
 		// state.
-		c.FocusLine()
+		c.FocusLine(false)

 		currentCtx := gui.State.ContextMgr.Current()
 		if currentCtx.GetKey() == context.NORMAL_MAIN_CONTEXT_KEY || currentCtx.GetKey() == context.NORMAL_SECONDARY_CONTEXT_KEY {
@@ -247,8 +247,6 @@ type TranslationSet struct {
 	UpdateFailedErr                       string
 	ConfirmQuitDuringUpdateTitle          string
 	ConfirmQuitDuringUpdate               string
-	MergeToolTitle                        string
-	MergeToolPrompt                       string
 	IntroPopupMessage                     string
 	NonReloadableConfigWarningTitle       string
 	NonReloadableConfigWarning            string
@@ -427,6 +425,7 @@ type TranslationSet struct {
 	ViewItemFiles                         string
 	CommitFilesTitle                      string
 	CheckoutCommitFileTooltip             string
+	CannotCheckoutWithModifiedFilesErr    string
 	CanOnlyDiscardFromLocalCommits        string
 	Remove                                string
 	DiscardOldFileChangeTooltip           string
@@ -1343,8 +1342,6 @@ func EnglishTranslationSet() *TranslationSet {
 		UpdateFailedErr:                      "Update failed: {{.errMessage}}",
 		ConfirmQuitDuringUpdateTitle:         "Currently updating",
 		ConfirmQuitDuringUpdate:              "An update is in progress. Are you sure you want to quit?",
-		MergeToolTitle:                       "Merge tool",
-		MergeToolPrompt:                      "Are you sure you want to open `git mergetool`?",
 		IntroPopupMessage:                    englishIntroPopupMessage,
 		NonReloadableConfigWarningTitle:      "Config changed",
 		NonReloadableConfigWarning:           englishNonReloadableConfigWarning,
@@ -1529,6 +1526,7 @@ func EnglishTranslationSet() *TranslationSet {
 		ViewItemFiles:                        "View files",
 		CommitFilesTitle:                     "Commit files",
 		CheckoutCommitFileTooltip:            "Checkout file. This replaces the file in your working tree with the version from the selected commit.",
+		CannotCheckoutWithModifiedFilesErr:   "You have local modifications for the file(s) you are trying to check out. You need to stash or discard these first.",
 		CanOnlyDiscardFromLocalCommits:       "Changes can only be discarded from local commits",
 		Remove:                               "Remove",
 		DiscardOldFileChangeTooltip:          "Discard this commit's changes to this file. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes this file.",
@@ -2214,9 +2212,9 @@ gui:
 keybinding:
  universal:
    suspendApp: <disabled>
-	redo: <c-z>
+    redo: <c-z>

- The 'git.paging.useConfig' option has been removed. If you were relying on it to configure your pager, you'll have to explicitly set the pager again using the git.paging.pager' option.
+- The 'git.paging.useConfig' option has been removed. If you were relying on it to configure your pager, you'll have to explicitly set the pager again using the 'git.paging.pager' option.
 `,
 		},
 	}
@@ -227,8 +227,6 @@
  "UpdateFailedErr": "更新に失敗しました: {{.errMessage}}",
  "ConfirmQuitDuringUpdateTitle": "現在更新中です",
  "ConfirmQuitDuringUpdate": "更新が進行中です。本当に終了してよろしいですか？",
-  "MergeToolTitle": "マージツール",
-  "MergeToolPrompt": "`git mergetool`を開いてもよろしいですか？",
  "NonReloadableConfigWarningTitle": "設定が変更されました",
  "NonReloadableConfigWarning": "以下の設定が変更されましたが、変更はすぐには反映されません。変更を反映するには、lazygitを終了して再起動してください：\n\n{{configs}}",
  "GitconfigParseErr": "引用符で囲まれていない'\\'文字が存在するため、Gogitがgitconfigファイルの解析に失敗しました。これらを削除することで問題が解決するはずです。",
@@ -122,8 +122,6 @@
  "UpdateFailedErr": "업데이트 실패: {{.errMessage}}",
  "ConfirmQuitDuringUpdateTitle": "현재 업데이트 중입니다.",
  "ConfirmQuitDuringUpdate": "현재 업데이트를 진행 중입니다.종료하시겠습니까?",
-  "MergeToolTitle": "병합 도구",
-  "MergeToolPrompt": "정말로 `git mergetool`을 여시겠습니까?",
  "GitconfigParseErr": "따옴표로 묶이지 않은 '\\' 문자가 있어서 Gogit이 gitconfig 파일을 분석하지 못했습니다. 이를 제거하면 문제가 해결됩니다.",
  "EditFile": "파일 편집",
  "OpenFile": "파일 닫기",
@@ -178,8 +178,6 @@
  "UpdateFailedErr": "Aktualizacja nie powiodła się: {{.errMessage}}",
  "ConfirmQuitDuringUpdateTitle": "Aktualizacja w toku",
  "ConfirmQuitDuringUpdate": "Aktualizacja jest w toku. Czy na pewno chcesz wyjść?",
-  "MergeToolTitle": "Narzędzie scalania",
-  "MergeToolPrompt": "Czy na pewno chcesz otworzyć `git mergetool`?",
  "GitconfigParseErr": "Gogit nie mógł przetworzyć pliku gitconfig z powodu obecności niezacytowanych znaków '\\'. Usunięcie ich powinno rozwiązać problem.",
  "EditFile": "Edytuj plik",
  "EditFileTooltip": "Otwórz plik w zewnętrznym edytorze.",
@@ -219,8 +219,6 @@
  "UpdateFailedErr": "Falha na atualização: {{.errMessage}}",
  "ConfirmQuitDuringUpdateTitle": "Atualmente atualizando",
  "ConfirmQuitDuringUpdate": "Uma atualização está em andamento. Tem certeza que deseja sair?",
-  "MergeToolTitle": "Ferramenta de mesclagem",
-  "MergeToolPrompt": "Tem certeza de que deseja abrir o  `git mergetool`?",
  "NonReloadableConfigWarningTitle": "Configuração alterada",
  "NonReloadableConfigWarning": "As seguintes configurações foram alteradas, mas a mudança não tem efeito imediatamente. Encerre e reinicie o lazygit para que as mudanças tenham efeito:\n\n{{configs}}",
  "GitconfigParseErr": "Gogit falhou ao analisar seu arquivo gitconfig devido à presença de caracteres '\\' não citados. Removendo-os deve corrigir o problema.",
@@ -122,8 +122,6 @@
  "UpdateFailedErr": "Не удалось обновить: {{.errMessage}}",
  "ConfirmQuitDuringUpdateTitle": "Идёт Обновление",
  "ConfirmQuitDuringUpdate": "Выполняется обновление. Вы уверены, что хотите выйти?",
-  "MergeToolTitle": "Инструмент слияния",
-  "MergeToolPrompt": "Вы уверены, что хотите открыть `git mergetool`?",
  "GitconfigParseErr": "Gogit не удалось проанализировать ваш файл gitconfig из-за наличия символов «\\» без кавычек. Их удаление должно решить проблему.",
  "EditFile": "Редактировать файл",
  "OpenFile": "Открыть файл",
@@ -48,7 +48,7 @@
  "OpenDiffTool": "使用外部差异比较工具(git difftool)",
  "OpenMergeTool": "打开外部合并工具(git mergetool)",
  "Refresh": "刷新",
-  "RefreshTooltip": "刷新git状态(即在后台上运行`git status`,`git branch`等命令以更新面板内容) 不会运行`git fetch`",
+  "RefreshTooltip": "刷新Git状态（即在后台运行`git status`、`git branch`等命令以更新面板内容）。此操作不会执行`git fetch`。",
  "Push": "推送",
  "Pull": "拉取",
  "PushTooltip": "推送当前分支到它的上游。如果上游未配置，您可以在弹窗中配置上游分支。",
@@ -132,8 +132,15 @@
  "NewBranch": "新分支",
  "NewBranchFromStashTooltip": "从选定的贮藏项创建一个新分支。这是通过 git 检查创建贮藏项的提交，从该提交创建一个新分支，然后将贮藏项作为附加提交应用到新分支来实现的。",
  "MoveCommitsToNewBranch": "移动提交至新分支",
+  "MoveCommitsToNewBranchTooltip": "创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。\n\n请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。",
+  "MoveCommitsToNewBranchFromMainPrompt": "这将把所有未推送的提交移动到一个新分支（基于 {{.baseBranchName}}）。然后，它会将当前分支硬重置到其上游分支。您要继续吗？",
+  "MoveCommitsToNewBranchMenuPrompt": "这将把所有未推送的提交移动到一个新分支。这个新分支可以从主分支（{{.baseBranchName}}）创建，也可以堆叠在当前分支之上。您希望选择哪种方式？",
+  "MoveCommitsToNewBranchFromBaseItem": "从基础分支创建新分支 (%s)",
+  "MoveCommitsToNewBranchStackedItem": "堆叠在当前分支上的新分支 (%s)",
  "CannotMoveCommitsFromDetachedHead": "无法从分离头移动提交",
  "CannotMoveCommitsNoUpstream": "无法从没有上游分支的分支中移动提交",
+  "CannotMoveCommitsBehindUpstream": "无法移动落后于其上游分支的分支的提交",
+  "CannotMoveCommitsNoUnpushedCommits": "没有未推送的提交可以移动到新分支",
  "NoBranchesThisRepo": "此仓库中没有分支",
  "CommitWithoutMessageErr": "您必须编写提交消息才能进行提交",
  "Close": "关闭",
@@ -150,7 +157,7 @@
  "Squash": "压缩(Squash)",
  "PickCommitTooltip": "标记选中的提交为 picked（变基过程中）。这意味该提交将在后续的变基中保留。",
  "Pick": "拣选(Pick)",
-  "Edit": "编辑",
+  "Edit": "编辑(Edit)",
  "Revert": "撤销(Revert)",
  "RevertCommitTooltip": "为所选提交创建还原提交，这会反向应用所选提交的更改。",
  "Reword": "改写提交",
@@ -228,8 +235,7 @@
  "UpdateFailedErr": "更新失败: {{.errMessage}}",
  "ConfirmQuitDuringUpdateTitle": "当前正在更新中...",
  "ConfirmQuitDuringUpdate": "当前正在更新中，您确定要退出吗？",
-  "MergeToolTitle": "合并工具",
-  "MergeToolPrompt": "确定要打开 `git mergetool` 吗?",
+  "IntroPopupMessage": "\n感谢使用 lazygit！您真是太棒了。有三件事想与您分享：\n\n 1) 如果您想了解 lazygit 的功能，请观看此视频：\n      https://youtu.be/CPLdltN7wgE\n\n 2) 请务必阅读最新的发布说明：\n      https://github.com/jesseduffield/lazygit/releases\n\n 3) 如果您在使用 git，那您就是程序员！在您的帮助下，我们可以让\n    lazygit 变得更好，所以考虑成为贡献者，加入我们的乐趣吧：\n      https://github.com/jesseduffield/lazygit\n    或者仅仅给仓库点个星，分享这份喜爱！\n\n 4) 如果 lazygit 让您的生活更轻松，您可以通过点击\n    右下角的捐赠按钮来表达感谢。捐赠不会获得优先支持，\n    但我们非常感激。\n\n按 {{confirmationKey}} 键开始。\n",
  "NonReloadableConfigWarningTitle": "配置已更改",
  "NonReloadableConfigWarning": "以下配置设置已更改，但更改不会立即生效。请退出并重新启动lazygit以使更改生效：\n\n{{configs}}",
  "GitconfigParseErr": "由于存在未加引号的'\\'字符，因此 Gogit 无法解析您的 gitconfig 文件。删除它们应该可以解决问题。",
@@ -244,8 +250,15 @@
  "FocusMainView": "聚焦主视图",
  "Merge": "合并到当前检出的分支",
  "MergeBranchTooltip": "Merge selected branch into currently checked out branch.",
+  "RegularMergeFastForward": "常规合并（快进）",
+  "RegularMergeFastForwardTooltip": "将 '{{.checkedOutBranch}}' 快进到 '{{.selectedBranch}}'，不创建合并提交。",
+  "CannotFastForwardMerge": "无法将 '{{.checkedOutBranch}}' 快进到 '{{.selectedBranch}}'",
+  "RegularMergeNonFastForward": "常规合并（带合并提交）",
+  "RegularMergeNonFastForwardTooltip": "将 '{{.selectedBranch}}' 合并到 '{{.checkedOutBranch}}'，创建一个合并提交。",
  "SquashMergeUncommitted": "压缩合并并保持未提交状态",
+  "SquashMergeUncommittedTooltip": "将 '{{.selectedBranch}}' 压缩合并到工作树中。",
  "SquashMergeCommitted": "压缩合并，然后提交",
+  "SquashMergeCommittedTooltip": "将 '{{.selectedBranch}}' 压缩合并到 '{{.checkedOutBranch}}' 作为一次提交。",
  "ConfirmQuit": "您确定要退出吗？",
  "SwitchRepo": "切换到最近的仓库",
  "AllBranchesLogGraph": "显示/循环所有分支日志",
@@ -265,6 +278,10 @@
  "DiscardSelection": "取消变更(git reset)",
  "DiscardSelectionTooltip": "当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更",
  "ToggleSelectHunk": "切换代码块选择",
+  "SelectHunk": "选择代码块",
+  "SelectLineByLine": "逐行选择",
+  "ToggleSelectHunkTooltip": "切换逐行选择与代码块选择模式。",
+  "HunkStagingHint": "代码块选择模式现在是暂存区的默认模式。如果您想暂存单行，请按 '%s' 切换到逐行模式。\n\n如果您希望默认使用逐行模式（像早期 lazygit 版本那样），请将\n\ngui:\n  useHunkModeInStagingView: false\n\n添加到您的 lazygit 配置中。",
  "ToggleSelectionForPatch": "添加/移除 行到补丁",
  "EditHunk": "编辑代码块",
  "EditHunkTooltip": "在外部编辑器中编辑选中的代码块",
@@ -283,16 +300,20 @@
  "ViewMergeRebaseOptionsTooltip": "查看当前合并或变基的中止、继续、跳过选项",
  "ViewMergeOptions": "查看合并选项",
  "ViewRebaseOptions": "查看变基选项",
+  "ViewCherryPickOptions": "查看拣选选项",
  "ViewRevertOptions": "查看撤销选项",
  "NotMergingOrRebasing": "您目前既不进行变基也不进行合并",
  "AlreadyRebasing": "在变基时无法执行此操作",
  "RecentRepos": "最近的仓库",
  "MergeOptionsTitle": "合并选项",
  "RebaseOptionsTitle": "变基选项",
+  "CherryPickOptionsTitle": "拣选选项",
  "RevertOptionsTitle": "撤销选项",
  "CommitSummaryTitle": "提交信息",
  "CommitDescriptionTitle": "提交信息说明",
  "CommitDescriptionSubTitle": "按 {{.togglePanelKeyBinding}} 键切换焦点, {{.commitMenuKeybinding}} 打开菜单",
+  "CommitDescriptionFooter": "按 {{.confirmInEditorKeybinding}} 提交",
+  "CommitDescriptionFooterTwoBindings": "按 {{.confirmInEditorKeybinding1}} 或 {{.confirmInEditorKeybinding2}} 提交",
  "CommitHooksDisabledSubTitle": "(钩子已禁用)",
  "LocalBranchesTitle": "本地分支",
  "SearchTitle": "搜索",
@@ -304,7 +325,8 @@
  "PatchBuildingTitle": "构建补丁中",
  "InformationTitle": "信息",
  "SecondaryTitle": "次要",
-  "ReflogCommitsTitle": "Reflog",
+  "ReflogCommitsTitle": "引用日志",
+  "ConflictsResolved": "所有合并冲突已解决。继续 %s 吗？",
  "Continue": "继续",
  "UnstagedFilesAfterConflictsResolved": "冲突解决后文件已被修改。是否自动暂存并继续？",
  "RebasingTitle": "变基 '{{.checkedOutBranch}}'",
@@ -321,10 +343,15 @@
  "PullRequestNoUpstream": "没有设置上游的分支无法执行拉取请求",
  "ErrorOccurred": "发生错误！请在以下位置创建 issue",
  "ConflictLabel": "冲突",
+  "PendingRebaseTodosSectionHeader": "待处理变基任务",
+  "PendingCherryPicksSectionHeader": "待处理拣选",
+  "PendingRevertsSectionHeader": "待处理还原",
  "CommitsSectionHeader": "提交",
  "YouDied": "您死了！",
  "RewordNotSupported": "当前不支持交互式重新基准化时的重新措词提交",
  "ChangingThisActionIsNotAllowed": "不允许更改这类变基待办项目",
+  "NotAllowedMidCherryPickOrRevert": "在拣选或还原过程中不允许此操作",
+  "PickIsOnlyAllowedDuringRebase": "此操作仅在变基过程中允许",
  "DroppingMergeRequiresSingleSelection": "删除合并提交需要单个选中项",
  "CherryPickCopy": "复制提交(拣选)",
  "CherryPickCopyTooltip": "标记提交为已复制。然后，在本地提交视图中，您可以按 `{{.paste}}` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `{{.escape}}` 来取消选择。",
@@ -344,6 +371,8 @@
  "ScrollUp": "向上滚动",
  "ScrollUpMainWindow": "向上滚动主面板",
  "ScrollDownMainWindow": "向下滚动主面板",
+  "SuspendApp": "挂起应用程序",
+  "CannotSuspendApp": "Windows 不支持挂起应用程序",
  "AmendCommitTitle": "修补(amend)提交",
  "AmendCommitPrompt": "您确定要使用暂存文件来修补此提交吗？",
  "AmendCommitWithConflictsMenuPrompt": "警告：您即将使用已解决的冲突来修正上一个已完成的提交。此时这样做很可能并非您所期望的。更可能的情况是，您只是想继续执行变基操作。\n\n您仍然想要修正前一个提交吗？",
@@ -365,6 +394,8 @@
  "MergingStatus": "合并中...",
  "LowercaseRebasingStatus": "变基中...",
  "LowercaseMergingStatus": "合并中...",
+  "LowercaseCherryPickingStatus": "拣选中",
+  "LowercaseRevertingStatus": "还原中",
  "AmendingStatus": "正在修补",
  "CherryPickingStatus": "正在拣选",
  "UndoingStatus": "正在撤销",
@@ -374,6 +405,7 @@
  "RewordingStatus": "修改提交信息",
  "RevertingStatus": "还原中...",
  "CreatingFixupCommitStatus": "正在创建一个修复提交",
+  "MovingCommitsToNewBranchStatus": "正在将提交移动到新分支",
  "CommitFiles": "提交文件",
  "SubCommitsDynamicTitle": "提交 (%s)",
  "CommitFilesDynamicTitle": "比较文件差异 (%s)",
@@ -387,12 +419,19 @@
  "DiscardFileChangesTitle": "放弃文件变更",
  "DiscardFileChangesPrompt": "您确定要舍弃此提交对该文件的变更吗？如果此文件是在此提交中创建的，它将被删除",
  "DisabledForGPG": "使用GPG的用户无法使用此功能。\n\n如果您正在使用密码代理（如gpg-agent）以避免每次签名时输入密码，可以通过在lazygit配置文件中添加\n\ngit:\n  overrideGpg: true\n\n来启用此功能。",
+  "CreateRepo": "不在 git 仓库中。创建一个新的 git 仓库吗？(y/N): ",
  "BareRepo": "您已经尝试在空仓库中打开Lazygit，但是Lazygit还不支持空仓库。打开最近的仓库吗？(y / n) ",
  "InitialBranch": "分支名称? (git的默认值为空): ",
  "NoRecentRepositories": "必须在git存储库中打开lazygit。没有有效的最近存储库。即将退出...",
  "IncorrectNotARepository": "'notARepository'的值不正确。它应该是“prompt”，“create”，“skip”或“quit”中的一个。",
  "AutoStashTitle": "自动存储？",
  "AutoStashPrompt": "您必须隐藏并弹出变更以使变更生效。自动执行？(enter/esc)",
+  "AutoStashForUndo": "正在自动储藏更改以便撤销到 %s",
+  "AutoStashForCheckout": "正在自动储藏更改以便检出 %s",
+  "AutoStashForNewBranch": "正在自动储藏更改以便创建新分支 %s",
+  "AutoStashForMovingPatchToIndex": "正在自动储藏更改以便将自定义补丁从 %s 移动到暂存区",
+  "AutoStashForCherryPicking": "正在自动储藏更改以便拣选提交",
+  "AutoStashForReverting": "正在自动储藏更改以便还原提交",
  "Discard": "查看'放弃变更'选项",
  "DiscardChangesTitle": "放弃变更",
  "DiscardFileChangesTooltip": "查看选中文件的放弃变更选项",
@@ -435,6 +474,7 @@
  "ResetSoftTooltip": "将 HEAD 重置为所选提交，并将当前提交和所选提交之间的更改保留为已暂存更改。",
  "ResetMixedTooltip": "将 HEAD 重置为所选提交，并将当前提交和所选提交之间的更改保留为未暂存的更改。",
  "ResetHardTooltip": "将 HEAD 重置为所选提交，并丢弃当前提交和所选提交之间的所有更改，以及工作树中的所有当前修改。",
+  "ResetHardConfirmation": "您确定要执行硬重置吗？这将丢弃所有未提交的更改（包括已暂存和未暂存的），且无法撤销。",
  "PressEnterToReturn": "按下 Enter 键返回 lazygit",
  "ViewStashOptions": "查看贮藏选项",
  "ViewStashOptionsTooltip": "查看贮藏选项（例如：贮藏所有、贮藏已暂存变更、贮藏未暂存变更）",
@@ -465,11 +505,17 @@
  "EnterCommitFile": "输入文件以将所选行添加到补丁中(或切换目录折叠)",
  "EnterCommitFileTooltip": "如果已选择一个文件，则Enter进入该文件，以便您可以向自定义补丁添加/删除单独的行。如果选择了目录，则切换目录。",
  "ExitCustomPatchBuilder": "退出逐行模式",
+  "ExitFocusedMainView": "退出回到侧边面板",
  "EnterUpstream": "以这种格式输入上游：'<远程仓库> <分支名称>'",
  "InvalidUpstream": "上游格式无效，格式应当为：'<remote> <branchname>'",
  "NewRemote": "添加新的远程仓库",
  "NewRemoteName": "新远程仓库名称:",
  "NewRemoteUrl": "新远程仓库 URL:",
+  "AddForkRemote": "添加复刻远程仓库",
+  "AddForkRemoteUsername": "复刻所有者（用户名/组织）。使用 用户名:分支 来检出分支",
+  "AddForkRemoteTooltip": "通过替换 origin URL 中的所有者来快速添加复刻远程仓库，并可选择从新远程仓库检出分支。",
+  "IncompatibleForkAlreadyExistsError": "远程仓库 {{.remoteName}} 已存在且 URL 不同",
+  "NoOriginRemote": "此操作需要 'origin' 远程仓库",
  "ViewBranches": "查看分支",
  "EditRemoteName": "输入远程仓库 {{.remoteName}} 的新名称：",
  "EditRemoteUrl": "输入远程仓库 {{.remoteName}} 的新 URL：",
@@ -533,6 +579,9 @@
  "ViewResetToUpstreamOptions": "查看上游重置选项",
  "NextScreenMode": "下一屏模式(正常/半屏/全屏)",
  "PrevScreenMode": "上一屏模式",
+  "CyclePagers": "切换分页器",
+  "CyclePagersTooltip": "从已配置的分页器列表中选择下一个分页器",
+  "CyclePagersDisabledReason": "未配置其他分页器",
  "StartSearch": "开始搜索",
  "StartFilter": "通过文本过滤当前视图",
  "Keybindings": "按键绑定",
@@ -551,6 +600,7 @@
  "RenameBranchWarning": "该分支正在跟踪远程仓库。此操作将仅会重命名本地分支名称，而不会重命名远程分支的名称。确定继续？",
  "OpenKeybindingsMenu": "打开菜单",
  "ResetCherryPick": "重置已拣选(复制)的提交",
+  "ResetCherryPickShort": "重置已复制的提交",
  "NextTab": "下一个标签",
  "PrevTab": "上一个标签",
  "CantUndoWhileRebasing": "进行基础调整时无法撤消",
@@ -558,6 +608,8 @@
  "MustStashWarning": "将补丁拉出到索引中需要存储和取消存储所做的变更。如果出现问题，您将可以从存储中访问文件。继续？",
  "MustStashTitle": "必须保存进度",
  "ConfirmationTitle": "确认面板",
+  "PromptTitle": "输入提示",
+  "PromptInputCannotBeEmptyToast": "不允许输入为空",
  "PrevPage": "上一页",
  "NextPage": "下一页",
  "GotoTop": "滚动到顶部",
@@ -584,6 +636,7 @@
  "SwapDiff": "反向 diff",
  "ViewDiffingOptions": "打开 diff 菜单",
  "ViewDiffingOptionsTooltip": "查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。",
+  "CancelDiffingMode": "取消差异比较模式",
  "OpenCommandLogMenu": "打开命令日志菜单",
  "OpenCommandLogMenuTooltip": "查看命令日志的选项，例如显示/隐藏命令日志以及聚焦命令日志",
  "ShowingGitDiff": "显示输出：",
@@ -616,10 +669,12 @@
  "CreateNewBranchFromCommit": "从提交创建新分支",
  "BuildingPatch": "正在构建补丁",
  "ViewCommits": "查看提交",
+  "MinGitVersionError": "Git 版本必须至少为 %s。请升级您的 Git 版本。",
  "RunningCustomCommandStatus": "正在运行自定义命令",
  "SubmoduleStashAndReset": "存放未提交的子模块变更和更新",
  "AndResetSubmodules": "和重置子模块",
  "EnterSubmoduleTooltip": "输入子模块",
+  "BackToParentRepo": "返回父仓库",
  "Enter": "进入",
  "CopySubmoduleNameToClipboard": "复制子模块名称到剪贴板",
  "RemoveSubmodule": "删除子模块",
@@ -648,6 +703,7 @@
  "BulkSubmoduleOptions": "批量子模块选项",
  "RunningCommand": "运行命令",
  "SubCommitsTitle": "子提交",
+  "ExitSubview": "退出子视图",
  "SubmodulesTitle": "子模块",
  "NavigationTitle": "列表面板导航",
  "SuggestionsCheatsheetTitle": "意见建议",
@@ -665,6 +721,7 @@
  "CommitHasNoTags": "提交没有标签",
  "CommitHasNoMessageBody": "提交没有信息正文",
  "PatchCopiedToClipboard": "补丁已复制到剪贴板",
+  "MessageCopiedToClipboard": "消息已复制到剪贴板",
  "CopiedToClipboard": "已复制到剪贴板",
  "ErrCannotEditDirectory": "无法编辑目录：您只能编辑单个文件",
  "ErrCannotCopyContentOfDirectory": "无法复制目录内容：只能复制单个文件的内容",
@@ -677,13 +734,18 @@
  "CommandLogHeader": "您可以通过按 '%s' 隐藏或集中显示该面板，或使用 `gui.showCommandLog: false`\n将其永久隐藏在您的配置中",
  "RandomTip": "随机小提示",
  "ToggleWhitespaceInDiffView": "切换是否在差异视图中显示空白字符差异",
+  "ToggleWhitespaceInDiffViewTooltip": "切换是否在差异视图中显示空白字符更改。\n\n默认值可在配置文件中通过键 'git.ignoreWhitespaceInDiffView' 更改。",
  "IgnoreWhitespaceDiffViewSubTitle": "(忽略空白)",
  "IgnoreWhitespaceNotSupportedHere": "该视图不支持忽略空白",
  "IncreaseContextInDiffView": "扩大差异视图中显示的上下文范围",
+  "IncreaseContextInDiffViewTooltip": "增加差异视图中变更周围显示的上下文量。\n\n默认值可在配置文件中通过键 'git.diffContextSize' 更改。",
  "DecreaseContextInDiffView": "缩小差异视图中显示的上下文范围",
+  "DecreaseContextInDiffViewTooltip": "减少差异视图中变更周围显示的上下文量。\n\n默认值可在配置文件中通过键 'git.diffContextSize' 更改。",
  "DiffContextSizeChanged": "将diff上下文大小更改为%d",
  "IncreaseRenameSimilarityThreshold": "提高重命名相似度阈值",
+  "IncreaseRenameSimilarityThresholdTooltip": "提高将删除和添加对视为重命名所需的相似度阈值。\n\n默认值可在配置文件中通过键 'git.renameSimilarityThreshold' 更改。",
  "DecreaseRenameSimilarityThreshold": "降低重命名相似度阈值",
+  "DecreaseRenameSimilarityThresholdTooltip": "降低将删除和添加对视为重命名所需的相似度阈值。\n\n默认值可在配置文件中通过键 'git.renameSimilarityThreshold' 更改。",
  "RenameSimilarityThresholdChanged": "已重命名相似度阈值更改为 %d%%",
  "CreatePullRequestOptions": "创建拉取请求选项",
  "DefaultBranch": "默认分支",
@@ -705,16 +767,21 @@
  "LogMenuTitle": "提交日志选项",
  "ToggleShowGitGraphAll": "切换显示完整 git 分支图(向 `git log` 命令传入 `--all` 选项)",
  "ShowGitGraph": "显示 git 分支图",
+  "ShowGitGraphTooltip": "在提交日志中显示或隐藏 Git 图形。\n\n默认值可在配置文件中通过键 'git.log.showGraph' 更改。",
  "SortOrder": "排序",
+  "SortOrderPromptLocalBranches": "本地分支的默认排序顺序可在配置文件中通过键 'git.localBranchSortOrder' 设置。",
+  "SortOrderPromptRemoteBranches": "远程分支的默认排序顺序可在配置文件中通过键 'git.remoteBranchSortOrder' 设置。",
  "SortAlphabetical": "字母顺序",
  "SortByDate": "日期大小",
  "SortByRecency": "新旧程度",
  "SortBasedOnReflog": "(基于reflog)",
  "SortCommits": "提交排序",
+  "SortCommitsTooltip": "更改提交日志中提交的排序顺序。\n\n默认值可在配置文件中通过键 'git.log.sortOrder' 更改。",
  "CantChangeContextSizeError": "无法在补丁构建模式下变更上下文，因为我们在发布该功能时懒得支持它。 如果您真的想要这么做，请告诉我们！",
  "OpenCommitInBrowser": "在浏览器中打开提交",
  "ViewBisectOptions": "查看二分查找选项",
  "ConfirmRevertCommit": "您确定要恢复{{.selectedCommit}}？",
+  "ConfirmRevertCommitRange": "确定要还原选定的提交吗？",
  "RewordInEditorTitle": "在编辑器中重写",
  "RewordInEditorPrompt": "您确定要在编辑器中重写此提交吗？",
  "CheckoutAutostashPrompt": "确定要检出 '%s' 吗？必要时将自动储藏更改。",
@@ -722,8 +789,9 @@
  "SoftResetPrompt": "您确定要软重置到 '%s' 吗？",
  "UpstreamGone": "（上游不存在）",
  "NukeDescription": "如果您想让工作树中的所有更改消失，可以这样做。如果存在受污染的子模块更改，这会将这些更改贮藏在子模块中。",
+  "NukeTreeConfirmation": "确定要清空工作树吗？这将丢弃工作树中的所有更改（已暂存、未暂存和未跟踪的），此操作不可撤销。",
  "DiscardStagedChangesDescription": "这将创建一个仅包含已暂存更改的新贮藏条目，然后这些更改删除，以便工作树仅保留未暂存的更改。",
-  "EmptyOutput": "<Empty output>",
+  "EmptyOutput": "<空输出>",
  "Patch": "补丁",
  "CustomPatch": "自定义补丁",
  "CommitsCopied": "已复制这些提交",
@@ -738,15 +806,21 @@
  "RemovePatchFromOriginalCommitTooltip": "从这些提交中删除该补丁。这是通过在提交时启动交互式变基，反向应用补丁，然后继续变基来实现的。如果之后的提交依赖于补丁，您可能需要解决冲突。",
  "MovePatchOutIntoIndex": "将补丁移出到索引中",
  "MovePatchOutIntoIndexTooltip": "将补丁从提交中移出并移入到索引中。这是通过在提交时启动交互式变基、反向应用补丁、继续变基直至完成，然后将补丁应用到索引来实现的。如果之后的提交依赖于补丁，您可能需要解决冲突。",
+  "MovePatchIntoNewCommit": "将补丁移动到原始提交之后的新提交中",
  "MovePatchIntoNewCommitTooltip": "将补丁从提交中移出并移至位于原始提交之上的新提交中。这是通过在原始提交处启动交互式变基，反向应用补丁，然后将补丁应用到索引并将其作为新提交提交，然后继续变基直至完成来实现的。如果以后的提交依赖于补丁，您可能需要解决冲突。",
+  "MovePatchIntoNewCommitBefore": "将补丁移动到原始提交之前的新提交中",
+  "MovePatchIntoNewCommitBeforeTooltip": "将补丁从其提交中移出，并放入原始提交之前的新提交中。当自定义补丁仅包含整个代码块甚至整个文件时效果最佳；如果包含部分代码块，则很可能出现冲突。",
  "MovePatchToSelectedCommit": "移动补丁到所选提交 (%s)",
  "MovePatchToSelectedCommitTooltip": "将补丁从其原始提交修改到选定的提交中。 实现这一点的方法是在原始提交时启动交互式重置，反向应用补丁， 然后在应用补丁和修改选定的提交之前，继续将其重新建立到选定的提交上。 重置将继续完成。如果源代码和目标代码提交之间的提交取决于补丁，您可能需要解决冲突。",
  "CopyPatchToClipboard": "复制补丁到剪贴板",
+  "MustStageFilesAffectedByPatchTitle": "必须暂存文件",
+  "MustStageFilesAffectedByPatchWarning": "将补丁应用到索引需要暂存受补丁影响的未暂存文件。请注意，应用补丁时可能会出现冲突。继续吗？",
  "NoMatchesFor": "%s %s 没有匹配项",
  "MatchesFor": "正在匹配'%s' (%d of %d) %s",
  "SearchKeybindings": "%s: 下一个匹配项, %s: 上一个匹配项, %s: 退出搜索模式",
  "SearchPrefix": "搜索: ",
  "FilterPrefix": "过滤: ",
+  "FilterPrefixMenu": "筛选（在筛选快捷键前添加 '@'）：",
  "ExitSearchMode": "%s：退出搜索模式",
  "ExitTextFilterMode": "%s：退出过滤模式",
  "Switch": "切换",
@@ -764,6 +838,7 @@
  "WorktreesTitle": "工作区",
  "WorktreeTitle": "工作区",
  "RemoveWorktreePrompt": "您确定要删除工作树 {{.worktreeName}}' ？",
+  "ForceRemoveWorktreePrompt": "'{{.worktreeName}}' 包含已修改或未跟踪的文件，或子模块（或包含所有这些）。确定要移除它吗？",
  "RemovingWorktree": "正在删除工作树",
  "AddingWorktree": "添加工作区",
  "CantDeleteCurrentWorktree": "您不能删除当前的工作树！",
@@ -789,6 +864,7 @@
  "MarkedBaseCommitStatus": "已标记一个主提交用于变基",
  "MarkAsBaseCommit": "标记一个主提交用于变基",
  "MarkAsBaseCommitTooltip": "选择下一次变基的主提交。当您变基到一个分支时，只有高于主提交的提交才会被引入。这使用“git rebase --onto”命令。",
+  "CancelMarkedBaseCommit": "取消标记的基础提交",
  "MarkedCommitMarker": "↑↑↑ 将从这里开始变基 ↑↑↑",
  "FailedToOpenURL": "打开URL %s 失败。\n\n错误：%v",
  "InvalidLazygitEditURL": "无效的lazygit-edit URL格式：%s",
@@ -798,6 +874,7 @@
  "QuickStartInteractiveRebaseTooltip": "为分支上的提交启动交互式变基。这将包括从 HEAD 提交到第一个合并提交或主分支提交的所有提交。\n如果您想从所选提交启动交互式变基，请按 `{{.editKey}}`。",
  "CannotQuickStartInteractiveRebase": "无法启动交互式变基：HEAD 提交是合并提交或存在于主分支上，因此没有适当的主提交来启动变基。您可以通过选择提交并按 `{{.editKey}}` 从特定提交启动交互式变基。",
  "ToggleRangeSelect": "切换拖动选择",
+  "DismissRangeSelect": "取消范围选择",
  "RangeSelectUp": "向上扩展选择范围",
  "RangeSelectDown": "向下扩展选择范围",
  "RangeSelectNotSupported": "该操作不支持范围选择，请选择单个项目",
@@ -825,6 +902,7 @@
    "RenameBranch": "重命名分支",
    "CreateBranch": "建立分支",
    "FastForwardBranch": "快进分支",
+    "AutoForwardBranches": "自动前推分支",
    "CherryPick": "(拣选) 粘贴提交",
    "CheckoutFile": "检出文件",
    "SquashCommitDown": "向下压缩提交",
@@ -863,6 +941,7 @@
    "ResolveConflictByDeletingFile": "通过删除文件解决冲突",
    "NotEnoughContextToStage": "差异上下文大小为0时无法暂存或取消暂存更改。请使用'%s'增大上下文。",
    "NotEnoughContextToDiscard": "差异上下文大小为0时无法丢弃更改。请使用'%s'增大上下文。",
+    "NotEnoughContextForCustomPatch": "在差异上下文大小为 0 时无法创建自定义补丁。请使用 '%s' 增加上下文。",
    "IgnoreExcludeFile": "忽略文件",
    "IgnoreFileErr": "无法忽略 .gitignore",
    "ExcludeFile": "排除文件",
@@ -887,10 +966,14 @@
    "DeleteRemoteBranch": "删除远程分支",
    "SetBranchUpstream": "设置分支上游",
    "AddRemote": "添加远程",
+    "AddForkRemote": "添加复刻远程仓库",
    "RemoveRemote": "移除远程",
    "UpdateRemote": "更新远程",
    "ApplyPatch": "应用补丁",
    "Stash": "贮藏(Stash)",
+    "PopStash": "弹出贮藏",
+    "ApplyStash": "应用贮藏",
+    "DropStash": "删除贮藏",
    "RenameStash": "重命名贮藏",
    "RemoveSubmodule": "删除子模块",
    "ResetSubmodule": "重置子模块",
@@ -958,6 +1041,17 @@
  "BreakingChangesByVersion": {
    "0.41.0": "- 当您按“g”调出 git 重置菜单时，“mixed”选项现在是第一个也是默认选项，而不是“soft”。这是因为“mixed”是最常用的选项。\n- 提交消息面板现在默认自动硬换行（即，当您到达页边距时，它会添加换行符）。您可以像这样调整配置：\n\ngit:\n  commit:\n    autoWrapCommitMessage: true\n    autoWrapWidth: 72\n\n- “v”键已在暂存视图中用于启动范围选择，但现在您可以使用它在任何视图中启动范围选择。不幸的是，这与粘贴提交（cherry-pick）的“v”键绑定冲突，因此现在粘贴提交是通过“shift+V”完成的，为了一致性，复制提交现在是通过“shift+C”而不是“c”。请注意，“v”键绑定只是启动范围选择的一种方法：您可以使用 shift+向上/向下箭头。因此，如果您想配置cherry-pick键绑定以获得旧行为，请在配置中设置以下内容：\n\nkeybinding:\n  universal:\n      toggleRangeSelect: <something other than v>\n    commits:\n      cherryPickCopy: 'c'\n      pasteCommits: 'v'\n\n- 使用“shift-S”压缩修复现在会弹出一个菜单，默认选项是压缩分支中的所有修复提交。仅压缩所选提交之上的修复提交的原始行为仍然可以作为该菜单中的第二个选项使用。\n- Push/pull/fetch 加载状态现在显示在分支上，而不是在弹出窗口中。这允许您例如并行获取多个分支并查看每个分支的状态。\n- 提交视图中的 git 日志图现在始终默认显示（以前仅在视图最大化时显示）。如果您发现这太冗余了，您可以通过 ctrl+L -> 'Show git graph' -> 'when maximized' 将其改回来\n- 在远程分支上按空格用于显示输入新本地分支名称的提示，以从远程分支检出。现在它只是直接检查远程分支，让您在同名的新本地分支或分离的头之间进行选择。旧的行为仍然可以通过“n”键绑定使用。\n- 默认情况下，过滤（例如按“/”时）不太模糊；它现在只匹配子字符串。多个子字符串可以通过用空格分隔来匹配。如果您想恢复到旧的行为，请在配置中设置以下内容：\n\ngui:\n  filterMode: 'fuzzy'\n\t  ",
    "0.44.0": "- gui.branchColors 配置选项已弃用；其将在未来的版本中被移除。请使用 gui.branchColorPatterns 代替。\n- 以 \"feature/\"，\"bugfix/\" 和 \"hotfix/\" 开头的分支自动上色已移除；如果您想要保留该功能，可以通过设置新的 gui.branchColorPatterns 选项来启用。",
-    "0.49.0": "- 执行shell命令（带':'提示符）不再使用交互式shell。如需在提示符中使用shell别名，需进行额外配置。详见：https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#using-aliases-or-functions-in-shell-commands"
-  }
+    "0.49.0": "- 执行shell命令（带':'提示符）不再使用交互式shell。如需在提示符中使用shell别名，需进行额外配置。详见：https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#using-aliases-or-functions-in-shell-commands",
+    "0.50.0": "- 拉取后，如果主分支落后于其上游分支，现在会自动前推。这对于自动保持主分支或 master 分支最新很有用。如果不希望这样，可以通过在配置中设置以下内容来禁用它：\n\ngit:\n  autoForwardBranches: none\n\n相反，如果希望功能分支也这样做，可以将其设置为 'allBranches'。",
+    "0.51.0": "- 自定义命令的 'subprocess'、'stream' 和 'showOutput' 字段已被替换为单个 'output' 字段。这应该是透明的，如果您在配置文件中使用了这些字段，它们应该已自动更新。但有一个显著变化：'stream' 字段过去意味着命令输出将流式传输到命令日志，并且命令将在伪终端 (pty) 中运行。我们将其转换为 'output: log'，这意味着命令输出将流式传输到命令日志，但不使用 pty，假设这是大多数人想要的。如果您确实希望在 pty 中运行命令，可以将其更改为 'output: logWithPty'。",
+    "0.54.0": "- 本地和远程分支的默认排序顺序已更改：过去本地分支是 'recency'（基于 reflog），远程分支是 'alphabetical'。这两者都已更改为 'date'（即提交者日期）。如果您更喜欢旧的默认设置，可以通过以下配置恢复：\n\ngit:\n  localBranchSortOrder: recency\n  remoteBranchSortOrder: alphabetical\n\n- 暂存区和自定义补丁构建视图中的默认选择模式已更改为块模式。在大多数情况下，这是更有用的模式，因为它通常可以节省大量按键。如果想切换回旧的行模式默认设置，可以通过在配置中添加以下内容来实现：\n\ngui:\n  useHunkModeInStagingView: false\n",
+    "0.55.0": "- 原先绑定到 ctrl-z 的 'redo' 命令，现在改为绑定到 shift-Z。这是因为 ctrl-z 现在用于挂起应用程序；在 Linux 世界中，这是该功能的常用键绑定。如果你想恢复此更改，可以在配置中添加以下内容：\n\nkeybinding:\n  universal:\n    suspendApp: <disabled>\n\tredo: <c-z>\n\n- 'git.paging.useConfig' 选项已被移除。如果你之前依赖它来配置你的分页器，现在必须使用 'git.paging.pager' 选项重新明确设置分页器。"
+  },
+  "ViewMergeConflictOptions": "查看合并冲突选项",
+  "ViewMergeConflictOptionsTooltip": "查看用于解决合并冲突的选项。",
+  "NoFilesWithMergeConflicts": "没有存在合并冲突的文件。",
+  "MergeConflictOptionsTitle": "解决合并冲突",
+  "UseCurrentChanges": "使用当前更改",
+  "UseIncomingChanges": "使用传入的更改",
+  "UseBothChanges": "两者都用"
 }
@@ -149,8 +149,6 @@
  "UpdateFailedErr": "更新失敗：{{.errMessage}}",
  "ConfirmQuitDuringUpdateTitle": "正在更新中",
  "ConfirmQuitDuringUpdate": "正在進行更新，是否結束？",
-  "MergeToolTitle": "合併工具",
-  "MergeToolPrompt": "是否開啟 'git mergetool'？",
  "GitconfigParseErr": "Gogit 無法解析你的 gitconfig 檔案，因為存在未引用的 '\\' 字符，刪除它們應該可以解決這個問題。",
  "EditFile": "編輯檔案",
  "EditFileTooltip": "使用外部編輯器開啟",
@@ -51,7 +51,7 @@ func RunTUI(raceDetector bool) {
 		if err != nil {
 			return err
 		}
-		listView.FocusPoint(0, app.itemIdx)
+		listView.FocusPoint(0, app.itemIdx, true)
 		return nil
 	}); err != nil {
 		log.Panicln(err)
@@ -66,7 +66,7 @@ func RunTUI(raceDetector bool) {
 		if err != nil {
 			return err
 		}
-		listView.FocusPoint(0, app.itemIdx)
+		listView.FocusPoint(0, app.itemIdx, true)
 		return nil
 	}); err != nil {
 		log.Panicln(err)
@@ -0,0 +1,40 @@
+package commit
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var CheckoutFileWithLocalModifications = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Checkout a file from a commit that has local modifications",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFileAndAdd("dir/file1.txt", "file1\n")
+		shell.CreateFileAndAdd("dir/file2.txt", "file2\n")
+		shell.Commit("one")
+		shell.UpdateFile("dir/file1.txt", "file1\nfile1 change\n")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Commits().
+			Focus().
+			Lines(
+				Contains("one").IsSelected(),
+			).
+			PressEnter()
+
+		t.Views().CommitFiles().
+			IsFocused().
+			Lines(
+				Equals("▼ dir").IsSelected(),
+				Equals("  A file1.txt"),
+				Equals("  A file2.txt"),
+			).
+			Press(keys.CommitFiles.CheckoutCommitFile)
+
+		t.ExpectPopup().Alert().Title(Equals("Error")).
+			Content(Contains("local modifications")).
+			Confirm()
+	},
+})
@@ -32,6 +32,9 @@ var Revert = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("Revert \"first commit\""),
 				Contains("first commit").IsSelected(),
 			).
+			Tap(func() {
+				t.Views().Main().Content(Contains("+myfile content"))
+			}).
 			SelectPreviousItem()

 		t.Views().Main().Content(Contains("-myfile content"))
@@ -11,6 +11,10 @@ var Search = NewIntegrationTest(NewIntegrationTestArgs{
 	Skip:         false,
 	SetupConfig:  func(config *config.AppConfig) {},
 	SetupRepo: func(shell *Shell) {
+		// Creating a branch avoids that searching for 't' will unexpectedly match the first commit
+		// (since it finds it in the extra info line, which is "HEAD -> master")
+		shell.NewBranch("branch")
+
 		shell.EmptyCommit("one")
 		shell.EmptyCommit("two")
 		shell.EmptyCommit("three")
@@ -103,6 +107,54 @@ var Search = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("three"),
 				Contains("two"),
 				Contains("one").IsSelected(),
+			).
+			NavigateToLine(Contains("three")).
+			Tap(func() {
+				t.Views().Search().IsVisible().Content(Contains("matches for 'o' (1 of 3)"))
+			}).
+			Press("N").
+			Tap(func() {
+				t.Views().Search().IsVisible().Content(Contains("matches for 'o' (1 of 3)"))
+			}).
+			Lines(
+				Contains("four").IsSelected(),
+				Contains("three"),
+				Contains("two"),
+				Contains("one"),
+			).
+			Press(keys.Universal.StartSearch).
+			Tap(func() {
+				t.ExpectSearch().
+					Type("t").
+					Confirm()
+
+				t.Views().Search().IsVisible().Content(Contains("matches for 't' (1 of 2)"))
+			}).
+			Lines(
+				Contains("four"),
+				Contains("three").IsSelected(),
+				Contains("two"),
+				Contains("one"),
+			).
+			SelectPreviousItem().
+			Tap(func() {
+				t.Views().Search().IsVisible().Content(Contains("matches for 't' (1 of 2)"))
+			}).
+			Lines(
+				Contains("four").IsSelected(),
+				Contains("three"),
+				Contains("two"),
+				Contains("one"),
+			).
+			Press("n").
+			Tap(func() {
+				t.Views().Search().IsVisible().Content(Contains("matches for 't' (1 of 2)"))
+			}).
+			Lines(
+				Contains("four"),
+				Contains("three").IsSelected(),
+				Contains("two"),
+				Contains("one"),
 			)
 	},
 })
@@ -0,0 +1,73 @@
+package custom_commands
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var CustomCommandsSubmenuWithSpecialKeybindings = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Using custom commands from a custom commands menu with keybindings that conflict with builtin ones",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupRepo:    func(shell *Shell) {},
+	SetupConfig: func(cfg *config.AppConfig) {
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
+			{
+				Key:         "x",
+				Description: "My Custom Commands",
+				CommandMenu: []config.CustomCommand{
+					{
+						Key:     "j",
+						Context: "global",
+						Command: "echo j",
+						Output:  "popup",
+					},
+					{
+						Key:     "H",
+						Context: "global",
+						Command: "echo H",
+						Output:  "popup",
+					},
+					{
+						Key:     "y",
+						Context: "global",
+						Command: "echo y",
+						Output:  "popup",
+					},
+					{
+						Key:     "<down>",
+						Context: "global",
+						Command: "echo down",
+						Output:  "popup",
+					},
+				},
+			},
+		}
+		cfg.GetUserConfig().Keybinding.Universal.ConfirmMenu = "y"
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Files().
+			Focus().
+			IsEmpty().
+			Press("x").
+			Tap(func() {
+				t.ExpectPopup().Menu().
+					Title(Equals("My Custom Commands")).
+					Lines(
+						Contains("j echo j"),
+						Contains("H echo H"),
+						Contains("  echo y"),
+						Contains("  echo down"),
+					)
+				t.GlobalPress("j")
+				t.ExpectPopup().Alert().Title(Equals("echo j")).Content(Equals("j")).Confirm()
+			}).
+			Press("x").
+			Tap(func() {
+				t.ExpectPopup().Menu().
+					Title(Equals("My Custom Commands"))
+				t.GlobalPress("H")
+				t.ExpectPopup().Alert().Title(Equals("echo H")).Content(Equals("H")).Confirm()
+			})
+	},
+})
@@ -0,0 +1,65 @@
+package custom_commands
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var MenuPromptWithKeys = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Using a custom command with menu options that have keybindings",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupRepo: func(shell *Shell) {
+		shell.EmptyCommit("initial commit")
+	},
+	SetupConfig: func(cfg *config.AppConfig) {
+		cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
+			{
+				Key:     "a",
+				Context: "files",
+				Command: `echo {{.Form.Choice | quote}} > result.txt`,
+				Prompts: []config.CustomCommandPrompt{
+					{
+						Key:   "Choice",
+						Type:  "menu",
+						Title: "Choose an option",
+						Options: []config.CustomCommandMenuOption{
+							{
+								Name:        "first",
+								Description: "First option",
+								Value:       "FIRST",
+								Key:         "1",
+							},
+							{
+								Name:        "second",
+								Description: "Second option",
+								Value:       "SECOND",
+								Key:         "H",
+							},
+							{
+								Name:        "third",
+								Description: "Third option",
+								Value:       "THIRD",
+								Key:         "3",
+							},
+						},
+					},
+				},
+			},
+		}
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Files().
+			IsFocused().
+			Press("a")
+
+		t.ExpectPopup().Menu().
+			Title(Equals("Choose an option"))
+
+		// 'H' is normally a navigation key (ScrollLeft), so this tests that menu item
+		// keybindings have proper precedence over non-essential navigation keys
+		t.Views().Menu().Press("H")
+
+		t.FileSystem().FileContent("result.txt", Equals("SECOND\n"))
+	},
+})
@@ -107,6 +107,7 @@ var tests = []*components.IntegrationTest{
 	commit.Checkout,
 	commit.CheckoutFileFromCommit,
 	commit.CheckoutFileFromRangeSelectionOfCommits,
+	commit.CheckoutFileWithLocalModifications,
 	commit.Commit,
 	commit.CommitMultiline,
 	commit.CommitSkipHooks,
@@ -170,10 +171,12 @@ var tests = []*components.IntegrationTest{
 	custom_commands.BasicCommand,
 	custom_commands.CheckForConflicts,
 	custom_commands.CustomCommandsSubmenu,
+	custom_commands.CustomCommandsSubmenuWithSpecialKeybindings,
 	custom_commands.FormPrompts,
 	custom_commands.GlobalContext,
 	custom_commands.MenuFromCommand,
 	custom_commands.MenuFromCommandsOutput,
+	custom_commands.MenuPromptWithKeys,
 	custom_commands.MultipleContexts,
 	custom_commands.MultiplePrompts,
 	custom_commands.RunCommand,
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"unicode"

-	"github.com/mattn/go-runewidth"
+	"github.com/rivo/uniseg"
 	"github.com/samber/lo"
 	"golang.org/x/exp/slices"
 )
@@ -27,7 +27,7 @@ func StringWidth(s string) int {
 	// convert the characters to runes, which is unnecessary work in this case.
 	for i := range len(s) {
 		if s[i] > unicode.MaxASCII {
-			return runewidth.StringWidth(s)
+			return uniseg.StringWidth(s)
 		}
 	}

@@ -177,10 +177,26 @@ func MaxFn[T any](items []T, fn func(T) int) int {

 // TruncateWithEllipsis returns a string, truncated to a certain length, with an ellipsis
 func TruncateWithEllipsis(str string, limit int) string {
-	if StringWidth(str) > limit && limit <= 2 {
+	if StringWidth(str) <= limit {
+		return str
+	}
+	if limit <= 2 {
 		return strings.Repeat(".", limit)
 	}
-	return runewidth.Truncate(str, limit, "…")
+
+	state := -1
+	var grapheme string
+	var width int
+	truncatedStr := ""
+
+	for str != "" {
+		grapheme, str, width, state = uniseg.FirstGraphemeClusterInString(str, state)
+		if uniseg.StringWidth(truncatedStr)+width > limit-1 {
+			break
+		}
+		truncatedStr += grapheme
+	}
+	return truncatedStr + "…"
 }

 func SafeTruncate(str string, limit int) string {
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"

-	"github.com/mattn/go-runewidth"
+	"github.com/rivo/uniseg"
 	"github.com/stretchr/testify/assert"
 )

@@ -254,7 +254,7 @@ func TestRenderDisplayStrings(t *testing.T) {

 func BenchmarkStringWidthAsciiOriginal(b *testing.B) {
 	for b.Loop() {
-		runewidth.StringWidth("some ASCII string")
+		uniseg.StringWidth("some ASCII string")
 	}
 }

@@ -266,7 +266,7 @@ func BenchmarkStringWidthAsciiOptimized(b *testing.B) {

 func BenchmarkStringWidthNonAsciiOriginal(b *testing.B) {
 	for b.Loop() {
-		runewidth.StringWidth("some non-ASCII string 🍉")
+		uniseg.StringWidth("some non-ASCII string 🍉")
 	}
 }

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"strings"

-	"github.com/mattn/go-runewidth"
+	"github.com/rivo/uniseg"
 )

 // SplitLines takes a multiline string and splits it on newlines
@@ -151,7 +151,7 @@ func WrapViewLinesToWidth(wrap bool, editable bool, text string, width int, tabW
 		offset := 0
 		lastWhitespaceIndex := -1
 		for i, currChr := range line {
-			rw := runewidth.RuneWidth(currChr)
+			rw := uniseg.StringWidth(string(currChr))
 			n += rw

 			if n > width {
@@ -170,7 +170,7 @@ func WrapViewLinesToWidth(wrap bool, editable bool, text string, width int, tabW
 						appendWrappedLine(line[offset:lastWhitespaceIndex])
 					}
 					offset = lastWhitespaceIndex + 1
-					n = runewidth.StringWidth(line[offset : i+1])
+					n = uniseg.StringWidth(line[offset : i+1])
 				} else {
 					appendWrappedLine(line[offset:i])
 					offset = i
@@ -163,6 +163,10 @@
          "examples": [
            "feature"
          ]
+        },
+        "key": {
+          "type": "string",
+          "description": "Keybinding to invoke this menu option without needing to navigate to it"
        }
      },
      "additionalProperties": false,
@@ -163,6 +163,10 @@
          "examples": [
            "feature"
          ]
+        },
+        "key": {
+          "type": "string",
+          "description": "Keybinding to invoke this menu option without needing to navigate to it"
        }
      },
      "additionalProperties": false,
@@ -1,82 +0,0 @@
-An implementation of grapheme cluster boundaries from [Unicode text segmentation](https://unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries) (UAX 29), for Unicode version 15.0.0.
-
-## Quick start
-
-```
-go get "github.com/clipperhouse/uax29/v2/graphemes"
-```
-
-```go
-import "github.com/clipperhouse/uax29/v2/graphemes"
-
-text := "Hello, 世界. Nice dog! 👍🐶"
-
-tokens := graphemes.FromString(text)
-
-for tokens.Next() {                     // Next() returns true until end of data
-	fmt.Println(tokens.Value())         // Do something with the current grapheme
-}
-```
-
-[![Documentation](https://pkg.go.dev/badge/github.com/clipperhouse/uax29/v2/graphemes.svg)](https://pkg.go.dev/github.com/clipperhouse/uax29/v2/graphemes)
-
-_A grapheme is a “single visible character”, which might be a simple as a single letter, or a complex emoji that consists of several Unicode code points._
-
-## Conformance
-
-We use the Unicode [test suite](https://unicode.org/reports/tr41/tr41-26.html#Tests29). Status:
-
-![Go](https://github.com/clipperhouse/uax29/actions/workflows/gotest.yml/badge.svg)
-
-## APIs
-
-### If you have a `string`
-
-```go
-text := "Hello, 世界. Nice dog! 👍🐶"
-
-tokens := graphemes.FromString(text)
-
-for tokens.Next() {                     // Next() returns true until end of data
-	fmt.Println(tokens.Value())         // Do something with the current grapheme
-}
-```
-
-### If you have an `io.Reader`
-
-`FromReader` embeds a [`bufio.Scanner`](https://pkg.go.dev/bufio#Scanner), so just use those methods.
-
-```go
-r := getYourReader()                        // from a file or network maybe
-tokens := graphemes.FromReader(r)
-
-for tokens.Scan() {                         // Scan() returns true until error or EOF
-	fmt.Println(tokens.Text())              // Do something with the current grapheme
-}
-
-if tokens.Err() != nil {                    // Check the error
-	log.Fatal(tokens.Err())
-}
-```
-
-### If you have a `[]byte`
-
-```go
-b := []byte("Hello, 世界. Nice dog! 👍🐶")
-
-tokens := graphemes.FromBytes(b)
-
-for tokens.Next() {                     // Next() returns true until end of data
-	fmt.Println(tokens.Value())         // Do something with the current grapheme
-}
-```
-
-### Performance
-
-On a Mac M2 laptop, we see around 200MB/s, or around 100 million graphemes per second. You should see ~constant memory, and no allocations.
-
-### Invalid inputs
-
-Invalid UTF-8 input is considered undefined behavior. We test to ensure that bad inputs will not cause pathological outcomes, such as a panic or infinite loop. Callers should expect “garbage-in, garbage-out”.
-
-Your pipeline should probably include a call to [`utf8.Valid()`](https://pkg.go.dev/unicode/utf8#Valid).
@@ -1,28 +0,0 @@
-package graphemes
-
-import "github.com/clipperhouse/uax29/v2/internal/iterators"
-
-type Iterator[T iterators.Stringish] struct {
-	*iterators.Iterator[T]
-}
-
-var (
-	splitFuncString = splitFunc[string]
-	splitFuncBytes  = splitFunc[[]byte]
-)
-
-// FromString returns an iterator for the grapheme clusters in the input string.
-// Iterate while Next() is true, and access the grapheme via Value().
-func FromString(s string) Iterator[string] {
-	return Iterator[string]{
-		iterators.New(splitFuncString, s),
-	}
-}
-
-// FromBytes returns an iterator for the grapheme clusters in the input bytes.
-// Iterate while Next() is true, and access the grapheme via Value().
-func FromBytes(b []byte) Iterator[[]byte] {
-	return Iterator[[]byte]{
-		iterators.New(splitFuncBytes, b),
-	}
-}
@@ -1,25 +0,0 @@
-// Package graphemes implements Unicode grapheme cluster boundaries: https://unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries
-package graphemes
-
-import (
-	"bufio"
-	"io"
-)
-
-type Scanner struct {
-	*bufio.Scanner
-}
-
-// FromReader returns a Scanner, to split graphemes per
-// https://unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries.
-//
-// It embeds a [bufio.Scanner], so you can use its methods.
-//
-// Iterate through graphemes by calling Scan() until false, then check Err().
-func FromReader(r io.Reader) *Scanner {
-	sc := bufio.NewScanner(r)
-	sc.Split(SplitFunc)
-	return &Scanner{
-		Scanner: sc,
-	}
-}
@@ -1,174 +0,0 @@
-package graphemes
-
-import (
-	"bufio"
-
-	"github.com/clipperhouse/uax29/v2/internal/iterators"
-)
-
-// is determines if lookup intersects propert(ies)
-func (lookup property) is(properties property) bool {
-	return (lookup & properties) != 0
-}
-
-const _Ignore = _Extend
-
-// SplitFunc is a bufio.SplitFunc implementation of Unicode grapheme cluster segmentation, for use with bufio.Scanner.
-//
-// See https://unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries.
-var SplitFunc bufio.SplitFunc = splitFunc[[]byte]
-
-func splitFunc[T iterators.Stringish](data T, atEOF bool) (advance int, token T, err error) {
-	var empty T
-	if len(data) == 0 {
-		return 0, empty, nil
-	}
-
-	// These vars are stateful across loop iterations
-	var pos int
-	var lastExIgnore property = 0     // "last excluding ignored categories"
-	var lastLastExIgnore property = 0 // "last one before that"
-	var regionalIndicatorCount int
-
-	// Rules are usually of the form Cat1 × Cat2; "current" refers to the first property
-	// to the right of the ×, from which we look back or forward
-
-	current, w := lookup(data[pos:])
-	if w == 0 {
-		if !atEOF {
-			// Rune extends past current data, request more
-			return 0, empty, nil
-		}
-		pos = len(data)
-		return pos, data[:pos], nil
-	}
-
-	// https://unicode.org/reports/tr29/#GB1
-	// Start of text always advances
-	pos += w
-
-	for {
-		eot := pos == len(data) // "end of text"
-
-		if eot {
-			if !atEOF {
-				// Token extends past current data, request more
-				return 0, empty, nil
-			}
-
-			// https://unicode.org/reports/tr29/#GB2
-			break
-		}
-
-		/*
-			We've switched the evaluation order of GB1↓ and GB2↑. It's ok:
-			because we've checked for len(data) at the top of this function,
-			sot and eot are mutually exclusive, order doesn't matter.
-		*/
-
-		// Rules are usually of the form Cat1 × Cat2; "current" refers to the first property
-		// to the right of the ×, from which we look back or forward
-
-		// Remember previous properties to avoid lookups/lookbacks
-		last := current
-		if !last.is(_Ignore) {
-			lastLastExIgnore = lastExIgnore
-			lastExIgnore = last
-		}
-
-		current, w = lookup(data[pos:])
-		if w == 0 {
-			if atEOF {
-				// Just return the bytes, we can't do anything with them
-				pos = len(data)
-				break
-			}
-			// Rune extends past current data, request more
-			return 0, empty, nil
-		}
-
-		// Optimization: no rule can possibly apply
-		if current|last == 0 { // i.e. both are zero
-			break
-		}
-
-		// https://unicode.org/reports/tr29/#GB3
-		if current.is(_LF) && last.is(_CR) {
-			pos += w
-			continue
-		}
-
-		// https://unicode.org/reports/tr29/#GB4
-		// https://unicode.org/reports/tr29/#GB5
-		if (current | last).is(_Control | _CR | _LF) {
-			break
-		}
-
-		// https://unicode.org/reports/tr29/#GB6
-		if current.is(_L|_V|_LV|_LVT) && last.is(_L) {
-			pos += w
-			continue
-		}
-
-		// https://unicode.org/reports/tr29/#GB7
-		if current.is(_V|_T) && last.is(_LV|_V) {
-			pos += w
-			continue
-		}
-
-		// https://unicode.org/reports/tr29/#GB8
-		if current.is(_T) && last.is(_LVT|_T) {
-			pos += w
-			continue
-		}
-
-		// https://unicode.org/reports/tr29/#GB9
-		if current.is(_Extend | _ZWJ) {
-			pos += w
-			continue
-		}
-
-		// https://unicode.org/reports/tr29/#GB9a
-		if current.is(_SpacingMark) {
-			pos += w
-			continue
-		}
-
-		// https://unicode.org/reports/tr29/#GB9b
-		if last.is(_Prepend) {
-			pos += w
-			continue
-		}
-
-		// https://unicode.org/reports/tr29/#GB9c
-		// TODO(clipperhouse):
-		// It appears to be added in Unicode 15.1.0:
-		// https://unicode.org/versions/Unicode15.1.0/#Migration
-		// This package currently supports Unicode 15.0.0, so
-		// out of scope for now
-
-		// https://unicode.org/reports/tr29/#GB11
-		if current.is(_ExtendedPictographic) && last.is(_ZWJ) && lastLastExIgnore.is(_ExtendedPictographic) {
-			pos += w
-			continue
-		}
-
-		// https://unicode.org/reports/tr29/#GB12
-		// https://unicode.org/reports/tr29/#GB13
-		if (current & last).is(_RegionalIndicator) {
-			regionalIndicatorCount++
-
-			odd := regionalIndicatorCount%2 == 1
-			if odd {
-				pos += w
-				continue
-			}
-		}
-
-		// If we fall through all the above rules, it's a grapheme cluster break
-		break
-	}
-
-	// Return token
-	return pos, data[:pos], nil
-}
@@ -1,85 +0,0 @@
-package iterators
-
-type Stringish interface {
-	[]byte | string
-}
-
-type SplitFunc[T Stringish] func(T, bool) (int, T, error)
-
-// Iterator is a generic iterator for words that are either []byte or string.
-// Iterate while Next() is true, and access the word via Value().
-type Iterator[T Stringish] struct {
-	split SplitFunc[T]
-	data  T
-	start int
-	pos   int
-}
-
-// New creates a new Iterator for the given data and SplitFunc.
-func New[T Stringish](split SplitFunc[T], data T) *Iterator[T] {
-	return &Iterator[T]{
-		split: split,
-		data:  data,
-	}
-}
-
-// SetText sets the text for the iterator to operate on, and resets all state.
-func (iter *Iterator[T]) SetText(data T) {
-	iter.data = data
-	iter.start = 0
-	iter.pos = 0
-}
-
-// Split sets the SplitFunc for the Iterator.
-func (iter *Iterator[T]) Split(split SplitFunc[T]) {
-	iter.split = split
-}
-
-// Next advances the iterator to the next token. It returns false when there
-// are no remaining tokens or an error occurred.
-func (iter *Iterator[T]) Next() bool {
-	if iter.pos == len(iter.data) {
-		return false
-	}
-	if iter.pos > len(iter.data) {
-		panic("SplitFunc advanced beyond the end of the data")
-	}
-
-	iter.start = iter.pos
-
-	advance, _, err := iter.split(iter.data[iter.pos:], true)
-	if err != nil {
-		panic(err)
-	}
-	if advance <= 0 {
-		panic("SplitFunc returned a zero or negative advance")
-	}
-
-	iter.pos += advance
-	if iter.pos > len(iter.data) {
-		panic("SplitFunc advanced beyond the end of the data")
-	}
-
-	return true
-}
-
-// Value returns the current token.
-func (iter *Iterator[T]) Value() T {
-	return iter.data[iter.start:iter.pos]
-}
-
-// Start returns the byte position of the current token in the original data.
-func (iter *Iterator[T]) Start() int {
-	return iter.start
-}
-
-// End returns the byte position after the current token in the original data.
-func (iter *Iterator[T]) End() int {
-	return iter.pos
-}
-
-// Reset resets the iterator to the beginning of the data.
-func (iter *Iterator[T]) Reset() {
-	iter.start = 0
-	iter.pos = 0
-}
@@ -1 +1,3 @@
 coverage.txt
+.zed
+.idea
@@ -13,7 +13,7 @@ GOOS=js GOARCH=wasm go build -o yourfile.wasm

 You also need 5 other files in the same directory as the wasm. Four (`tcell.html`, `tcell.js`, `termstyle.css`, and `beep.wav`) are provided in the `webfiles` directory. The last one, `wasm_exec.js`, can be copied from GOROOT into the current directory by executing
 ```sh
-cp "$(go env GOROOT)/misc/wasm/wasm_exec.js" ./
+cp "$(go env GOROOT)/lib/wasm/wasm_exec.js" ./
 ```

 In `tcell.js`, you also need to change the constant
@@ -58,4 +58,4 @@ It is recommended to use an iframe if you want to embed the app into a webpage:

 ### Accessing files

-`io.Open(filename)` and other related functions for reading file systems do not work; use `http.Get(filename)` instead.
+`io.Open(filename)` and other related functions for reading file systems do not work; use `http.Get(filename)` instead.
@@ -16,8 +16,6 @@ It was inspired by _termbox_, but includes many additional improvements.
 [![Go Report Card](https://goreportcard.com/badge/github.com/gdamore/tcell/v2)](https://goreportcard.com/report/github.com/gdamore/tcell/v2)
 [![Latest Release](https://img.shields.io/github/v/release/gdamore/tcell.svg?logo=github&label=)](https://github.com/gdamore/tcell/releases)

-Please see [here](UKRAINE.md) for an important message for the people of Russia.
-
 NOTE: This is version 2 of _Tcell_. There are breaking changes relative to version 1.
 Version 1.x remains available using the import `github.com/gdamore/tcell`.

@@ -31,15 +29,6 @@ A number of example are posted up on our [Gallery](https://github.com/gdamore/tc

 Let us know if you want to add your masterpiece to the list!

-## Pure Go Terminfo Database
-
-_Tcell_ includes a full parser and expander for terminfo capability strings,
-so that it can avoid hard coding escape strings for formatting. It also favors
-portability, and includes support for all POSIX systems.
-
-The database is also flexible & extensible, and can be modified by either running
-a program to build the entire database, or an entry for just a single terminal.
-
 ## More Portable

 _Tcell_ is portable to a wide variety of systems, and is pure Go, without
@@ -51,14 +40,6 @@ and the version immediately prior ("oldstable").  This policy is necessary to ma
 update dependencies to pick up security fixes and new features, and it allows us to adopt changes
 (such as library and language features) that are only supported in newer versions of Go.

-## No Async IO
-
-_Tcell_ is able to operate without requiring `SIGIO` signals (unlike _termbox_),
-or asynchronous I/O, and can instead use standard Go file objects and Go routines.
-This means it should be safe, especially for
-use with programs that use exec, or otherwise need to manipulate the tty streams.
-This model is also much closer to idiomatic Go, leading to fewer surprises.
-
 ## Rich Unicode & non-Unicode support

 _Tcell_ includes enhanced support for Unicode, including wide characters and
@@ -77,15 +58,6 @@ drawing certain characters.
 _Tcell_ also has richer support for a larger number of special keys that some
 terminals can send.

-## Better Color Handling
-
-_Tcell_ will respect your terminal's color space as specified within your terminfo entries.
-For example attempts to emit color sequences on VT100 terminals
-won't result in unintended consequences.
-
-_Tcell_ maps 16 colors down to 8, for terminals that need it.
-(The upper 8 colors are just brighter versions of the lower 8.)
-
 ## Better Mouse Support

 _Tcell_ supports enhanced mouse tracking mode, so your application can receive
@@ -109,12 +81,15 @@ If you're lazy, and want them all anyway, see the `encoding` sub-directory.

 ## Wide & Combining Characters

-The `SetContent()` API takes a primary rune, and an optional list of combining runes.
-If any of the runes is a wide (East Asian) rune occupying two cells,
-then the library will skip output from the following cell. Care must be
-taken in the application to avoid explicitly attempting to set content in the
-next cell, otherwise the results are undefined. (Normally the wide character
-is displayed, and the other character is not; do not depend on that behavior.)
+The `Put()` API takes a string, which should be legal UTF-8, and displays
+the first grapheme (which may composed of multiple runes). It returns the
+actual width displayed, which can be used to advance the column positiion
+for the next display grapheme.  Alternatively, `PutStr()` or `PutStrStyled()`
+can be used to display a single line of text (which will be clipped at the
+edge of the screen).
+
+If a second character is displayed immediately in the cell adjacent to a
+wide character (offset by one instead of by two), then the results are undefined.

 ## Colors

@@ -129,11 +104,7 @@ a ticket.

 _Tcell_ _supports 24-bit color!_ (That is, if your terminal can support it.)

-NOTE: Technically the approach of using 24-bit RGB values for color is more
-accurately described as "direct color", but most people use the term "true color".
-We follow the (inaccurate) common convention.
-
-There are a few ways you can enable (or disable) true color.
+There are a few ways you can enable (or disable) 24-bit color.

 - For many terminals, we can detect it automatically if your terminal
  includes the `RGB` or `Tc` capabilities (or rather it did when the database
@@ -151,8 +122,8 @@ There are a few ways you can enable (or disable) true color.
 - You can disable 24-bit color by setting `TCELL_TRUECOLOR=disable` in your
  environment.

-When using TrueColor, programs will display the colors that the programmer
-intended, overriding any "`themes`" you may have set in your terminal
+When using 24-bit color, programs will display the colors that the programmer
+intended, overriding any "`themes`" the user may have set in their terminal
 emulator. (For some cases, accurate color fidelity is more important
 than respecting themes. For other cases, such as typical text apps that
 only use a few colors, its more desirable to respect the themes that
@@ -163,38 +134,10 @@ the user has established.)
 Reasonable attempts have been made to minimize sending data to terminals,
 avoiding repeated sequences or drawing the same cell on refresh updates.

-## Terminfo
-
-(Not relevant for Windows users.)
-
-The Terminfo implementation operates with a built-in database.
-This should satisfy most users. However, it can also (on systems
-with ncurses installed), dynamically parse the output from `infocmp`
-for terminals it does not already know about.
-
-See the `terminfo/` directory for more information about generating
-new entries for the built-in database.
-
-_Tcell_ requires that the terminal support the `cup` mode of cursor addressing.
-Ancient terminals without the ability to position the cursor directly
-are not supported.
-This is unlikely to be a problem; such terminals have not been mass-produced
-since the early 1970s.
-
 ## Mouse Support

-Mouse support is detected via the `kmous` terminfo variable, however,
-enablement/disablement and decoding mouse events is done using hard coded
-sequences based on the XTerm X11 model. All popular
-terminals with mouse tracking support this model. (Full terminfo support
-is not possible as terminfo sequences are not defined.)
-
-On Windows, the mouse works normally.
-
-Mouse wheel buttons on various terminals are known to work, but the support
-in terminal emulators, as well as support for various buttons and
-live mouse tracking, varies widely.
-Modern _xterm_, macOS _Terminal_, and _iTerm_ all work well.
+Mouse tracking, buttons, and even wheel mice works fine on most terminal
+emulators, as well as Windows.

 ## Bracketed Paste

@@ -107,23 +107,30 @@ s.SetStyle(defStyle)
 s.Clear()
 ```

-Text may be drawn on the screen using `SetContent`.
+Text may be drawn on the screen using `Put`, `PutStr`, or `PutStrStyled`.

 ```go
-s.SetContent(0, 0, 'H', nil, defStyle)
-s.SetContent(1, 0, 'i', nil, defStyle)
-s.SetContent(2, 0, '!', nil, defStyle)
+s.Put(0, 0, 'H', defStyle)
+s.Put(1, 0, 'i', defStyle)
+s.Put(2, 0, '!', defStyle)
 ```

-To draw text more easily, define a render function.
+which is equivalent to
+
+```go
+s.PutStrStyled(0, 0, "Hi!", defStyle)
+````
+
+To draw text more easily with wrapping, define a render function.

 ```go
 func drawText(s tcell.Screen, x1, y1, x2, y2 int, style tcell.Style, text string) {
 	row := y1
 	col := x1
-	for _, r := range []rune(text) {
-		s.SetContent(col, row, r, nil, style)
-		col++
+	var width int
+	for text != "" {
+		text, width = s.Put(col, row, text, style)
+		col += width
 		if col >= x2 {
 			row++
 			col = x1
@@ -131,6 +138,10 @@ func drawText(s tcell.Screen, x1, y1, x2, y2 int, style tcell.Style, text string
 		if row > y2 {
 			break
 		}
+		if width == 0 {
+			// incomplete grapheme at end of string
+			break
+		}
 	}
 }
 ```
@@ -178,9 +189,10 @@ import (
 func drawText(s tcell.Screen, x1, y1, x2, y2 int, style tcell.Style, text string) {
 	row := y1
 	col := x1
-	for _, r := range []rune(text) {
-		s.SetContent(col, row, r, nil, style)
-		col++
+	var width int
+	for text != "" {
+		text, width = s.Put(col, row, text, style)
+		col += width
 		if col >= x2 {
 			row++
 			col = x1
@@ -188,6 +200,10 @@ func drawText(s tcell.Screen, x1, y1, x2, y2 int, style tcell.Style, text string
 		if row > y2 {
 			break
 		}
+		if width == 0 {
+			// incomplete grapheme at end of string
+			break
+		}
 	}
 }

@@ -202,26 +218,26 @@ func drawBox(s tcell.Screen, x1, y1, x2, y2 int, style tcell.Style, text string)
 	// Fill background
 	for row := y1; row <= y2; row++ {
 		for col := x1; col <= x2; col++ {
-			s.SetContent(col, row, ' ', nil, style)
+			s.Put(col, row, " ", style)
 		}
 	}

 	// Draw borders
 	for col := x1; col <= x2; col++ {
-		s.SetContent(col, y1, tcell.RuneHLine, nil, style)
-		s.SetContent(col, y2, tcell.RuneHLine, nil, style)
+		s.Put(col, y1, string(tcell.RuneHLine), style)
+		s.Put(col, y2, string(tcell.RuneHLine), style)
 	}
 	for row := y1 + 1; row < y2; row++ {
-		s.SetContent(x1, row, tcell.RuneVLine, nil, style)
-		s.SetContent(x2, row, tcell.RuneVLine, nil, style)
+		s.Put(x1, row, string(tcell.RuneVLine), style)
+		s.Put(x2, row, string(tcell.RuneVLine), style)
 	}

 	// Only draw corners if necessary
 	if y1 != y2 && x1 != x2 {
-		s.SetContent(x1, y1, tcell.RuneULCorner, nil, style)
-		s.SetContent(x2, y1, tcell.RuneURCorner, nil, style)
-		s.SetContent(x1, y2, tcell.RuneLLCorner, nil, style)
-		s.SetContent(x2, y2, tcell.RuneLRCorner, nil, style)
+		s.Put(x1, y1, string(tcell.RuneULCorner), style)
+		s.Put(x2, y1, string(tcell.RuneURCorner), style)
+		s.Put(x1, y2, string(tcell.RuneLLCorner), style)
+		s.Put(x2, y2, string(tcell.RuneLRCorner), style)
 	}

 	drawText(s, x1+1, y1+1, x2-1, y2-1, style, text)
@@ -310,4 +326,3 @@ func main() {
 	}
 }
 ```
-
@@ -1,77 +0,0 @@
-# Ukraine, Russia, and a World Tragedy
-
-## A message to those inside Russia
-
-### Written March 4, 2022.
-
-It is with a very heavy heart that I write this.  I am normally opposed to the use of open source
-projects to communicate political positions or advocate for things outside the immediate relevancy
-to that project.
-
-However, the events occurring in Ukraine, and specifically the unprecedented invasion of Ukraine by
-Russian forces operating under orders from Russian President Vladimir Putin compel me to speak out.
-
-Those who know me, know that I have family, friends, and colleagues in Russia, and Ukraine both.  My closest friends
-have historically been Russian friends my wife's hometown of Chelyabinsk.  I myself have in the past
-frequently traveled to Russia, and indeed operated a software development firm with offices in St. Petersburg.
-I had a special kinship with Russia and its people.
-
-I say "had", because I fear that the actions of Putin, and the massive disinformation campaign that his regime
-has waged inside Russia, mean that it's likely that I won't see those friends again.  At present, I'm not sure
-my wife will see her own mother again.  We no longer feel it's safe for either of us to return Russia given
-actions taken by the regime to crack down on those who express disagreement.
-
-Russian citizens are being led to believe it is acting purely defensively, and that only legitimate military
-targets are being targeted, and that all the information we have received in the West are fakes.
-
-I am confident that nothing could be further from the truth.
-
-This has caused many in Russia, including people whom I respect and believe to be smarter than this, to
-stand by Putin, and endorse his actions. The claim is that the entirety of NATO is operating at the behest
-of the USA, and that the entirety of Europe was poised to attack Russia. While this is clearly absurd to those
-of us with any understanding of western politics, Russian citizens are being fed this lie, and believing it.
-
-If you're reading this from inside Russia -- YOU are the person that I hope this message reaches.  Your
-government is LYING to you.  Of course, all governments lie all the time.  But consider this.  Almost the
-entire world has condemned the invasion of Ukraine as criminal, and has applied sanctions.  Even countries
-which have poor relations with the US sanctioning Russia, as well as nations which historically have remained
-neutral.  (Famously neutral -- even during World War II, Switzerland has acted to apply sanctions in
-concert with the rest of the world.)
-
-Ask yourself, why does Putin fear a free press so much, if what he says is true?  Why the crack-downs on
-children expressing only a desire for peace with Ukraine?  Why would the entire world unified against him,
-if Putin was in the right?  Why would the only countries that stood with Russia against
-the UN resolution to condemn these acts as crimes be Belarus, North Korea, and Syria?  Even countries normally
-allied to Russia could not bring themselves to do more than abstain from the vote to condemn it.
-
-To be clear, I do not claim that the actions taken by the West or by the Ukrainian government were completely
-blameless.  On the contrary, I understand that Western media is biased, and the truth is rarely exactly
-as reported.  I believe that there is a kernel of truth in the claims of fascists and ultra-nationalist
-militias operating in Ukraine and specifically Donbas.  However, I am also equally certain that Putin's
-response is out of proportion, and that concerns about such militias are principally just a pretext to justify
-an invasion.
-
-Europe is at war, unlike we've seen in my lifetime.  The world is more divided, and closer to nuclear holocaust
-than it has been since the Cold War. And that is 100% the fault of Putin.
-
-While Putin remains in power, there cannot really be any way for Russian international relations to return
-to normal. Putin has set your country on a path to return to the Cold War, likely because he fancies himself
-to be a new Stalin.  However, unlike the Soviet Union, the Russian economy does not have the wherewithal to
-stand on its own, and the invasion of Ukraine has fully ensured that Russia will not find any friends anywhere
-else in Europe, and probably few places in Asia.
-
-The *only* paths forward for Russia are either a Russia without Putin (and those who would support his agenda),
-or a complete breakdown of Russian prosperity, likely followed by the increasing international conflict that will
-be the natural escalation from a country that is isolated and impoverished. Those of us observing from the West are
-gravely concerned, because we cannot see any end to this madness that does not result in nuclear conflict,
-unless from within.
-
-In the meantime, the worst prices will be paid for by innocents in Ukraine, and by young Russian mean
-forced to carry out the orders of Putin's corrupt regime.
-
-And *that* is why I write this -- to appeal to those within Russia to open your eyes, and think with
-your minds.  It is right and proper to be proud of your country and its rich heritage.  But it is also
-right and proper to look for ways to save it from the ruinous path that its current leadership has set it upon,
-and to recognize when that leadership is no longer acting in interest of the country or its people.
-
-  - Garrett D'Amore, March 4, 2022
@@ -1,4 +1,4 @@
-// Copyright 2024 The TCell Authors
+// Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use file except in compliance with the License.
@@ -15,23 +15,30 @@
 package tcell

 import (
-	"os"
-	"reflect"
-
-	runewidth "github.com/mattn/go-runewidth"
+	"github.com/rivo/uniseg"
 )

 type cell struct {
-	currMain  rune
-	currComb  []rune
+	currStr   string
+	lastStr   string
 	currStyle Style
-	lastMain  rune
 	lastStyle Style
-	lastComb  []rune
 	width     int
 	lock      bool
 }

+func (c *cell) setDirty(dirty bool) {
+	if dirty {
+		c.lastStr = ""
+	} else {
+		if c.currStr == "" {
+			c.currStr = " "
+		}
+		c.lastStr = c.currStr
+		c.lastStyle = c.currStyle
+	}
+}
+
 // CellBuffer represents a two-dimensional array of character cells.
 // This is primarily intended for use by Screen implementors; it
 // contains much of the common code they need.  To create one, just
@@ -48,28 +55,47 @@ type CellBuffer struct {
 // and style) for a cell at a given location.  If the background or
 // foreground of the style is set to ColorNone, then the respective
 // color is left un changed.
-func (cb *CellBuffer) SetContent(x int, y int,
-	mainc rune, combc []rune, style Style,
-) {
+//
+// Deprecated: Use Put instead, which this is implemented in terms of.
+func (cb *CellBuffer) SetContent(x int, y int, mainc rune, combc []rune, style Style) {
+	cb.Put(x, y, string(append([]rune{mainc}, combc...)), style)
+}
+
+// Put a single styled grapheme using the given string and style
+// at the same location.  Note that only the first grapheme in the string
+// will bre displayed, using only the 1 or 2 (depending on width) cells
+// located at x, y. It returns the rest of the string, and the width used.
+func (cb *CellBuffer) Put(x int, y int, str string, style Style) (string, int) {
+	var width int = 0
 	if x >= 0 && y >= 0 && x < cb.w && y < cb.h {
+		var cl string
 		c := &cb.cells[(y*cb.w)+x]
+		state := -1
+		for width == 0 && str != "" {
+			var g string
+			g, str, width, state = uniseg.FirstGraphemeClusterInString(str, state)
+			cl += g
+			if g == "" {
+				break
+			}
+		}

 		// Wide characters: we want to mark the "wide" cells
 		// dirty as well as the base cell, to make sure we consider
 		// both cells as dirty together.  We only need to do this
 		// if we're changing content
-		if (c.width > 0) && (mainc != c.currMain || len(combc) != len(c.currComb) || (len(combc) > 0 && !reflect.DeepEqual(combc, c.currComb))) {
-			for i := 0; i < c.width; i++ {
+		if width > 0 && cl != c.currStr {
+			// Prevent unnecessary boundchecks for first cell, since we already
+			// received that one.
+			c.setDirty(true)
+			for i := 1; i < width; i++ {
 				cb.SetDirty(x+i, y, true)
 			}
 		}

-		c.currComb = append([]rune{}, combc...)
+		c.currStr = cl
+		c.width = width

-		if c.currMain != mainc {
-			c.width = runewidth.RuneWidth(mainc)
-		}
-		c.currMain = mainc
 		if style.fg == ColorNone {
 			style.fg = c.currStyle.fg
 		}
@@ -78,23 +104,45 @@ func (cb *CellBuffer) SetContent(x int, y int,
 		}
 		c.currStyle = style
 	}
+	return str, width
+}
+
+// Get the contents of a character cell (or two adjacent cells), including the
+// the style and the display width in cells.  (The width can be either 1, normally,
+// or 2 for East Asian full-width characters.  If the width is 0, then the cell is
+// is empty.)
+func (cb *CellBuffer) Get(x, y int) (string, Style, int) {
+	var style Style
+	var width int
+	var str string
+	if x >= 0 && y >= 0 && x < cb.w && y < cb.h {
+		c := &cb.cells[(y*cb.w)+x]
+		str, style = c.currStr, c.currStyle
+		if width = c.width; width == 0 || str == "" {
+			width = 1
+			str = " "
+		}
+	}
+	return str, style, width
 }

 // GetContent returns the contents of a character cell, including the
 // primary rune, any combining character runes (which will usually be
 // nil), the style, and the display width in cells.  (The width can be
 // either 1, normally, or 2 for East Asian full-width characters.)
+//
+// Deprecated: Use Get, which this implemented in terms of.
 func (cb *CellBuffer) GetContent(x, y int) (rune, []rune, Style, int) {
-	var mainc rune
-	var combc []rune
 	var style Style
 	var width int
-	if x >= 0 && y >= 0 && x < cb.w && y < cb.h {
-		c := &cb.cells[(y*cb.w)+x]
-		mainc, combc, style = c.currMain, c.currComb, c.currStyle
-		if width = c.width; width == 0 || mainc < ' ' {
-			width = 1
-			mainc = ' '
+	var mainc rune
+	var combc []rune
+	str, style, width := cb.Get(x, y)
+	for i, r := range str {
+		if i == 0 {
+			mainc = r
+		} else {
+			combc = append(combc, r)
 		}
 	}
 	return mainc, combc, style, width
@@ -108,7 +156,7 @@ func (cb *CellBuffer) Size() (int, int) {
 // Invalidate marks all characters within the buffer as dirty.
 func (cb *CellBuffer) Invalidate() {
 	for i := range cb.cells {
-		cb.cells[i].lastMain = rune(0)
+		cb.cells[i].lastStr = ""
 	}
 }

@@ -121,23 +169,12 @@ func (cb *CellBuffer) Dirty(x, y int) bool {
 		if c.lock {
 			return false
 		}
-		if c.lastMain == rune(0) {
-			return true
-		}
-		if c.lastMain != c.currMain {
-			return true
-		}
 		if c.lastStyle != c.currStyle {
 			return true
 		}
-		if len(c.lastComb) != len(c.currComb) {
+		if c.lastStr != c.currStr {
 			return true
 		}
-		for i := range c.lastComb {
-			if c.lastComb[i] != c.currComb[i] {
-				return true
-			}
-		}
 	}
 	return false
 }
@@ -148,16 +185,7 @@ func (cb *CellBuffer) Dirty(x, y int) bool {
 func (cb *CellBuffer) SetDirty(x, y int, dirty bool) {
 	if x >= 0 && y >= 0 && x < cb.w && y < cb.h {
 		c := &cb.cells[(y*cb.w)+x]
-		if dirty {
-			c.lastMain = rune(0)
-		} else {
-			if c.currMain == rune(0) {
-				c.currMain = ' '
-			}
-			c.lastMain = c.currMain
-			c.lastComb = c.currComb
-			c.lastStyle = c.currStyle
-		}
+		c.setDirty(dirty)
 	}
 }

@@ -203,11 +231,10 @@ func (cb *CellBuffer) Resize(w, h int) {
 		for x := 0; x < w && x < cb.w; x++ {
 			oc := &cb.cells[(y*cb.w)+x]
 			nc := &newc[(y*w)+x]
-			nc.currMain = oc.currMain
-			nc.currComb = oc.currComb
+			nc.currStr = oc.currStr
 			nc.currStyle = oc.currStyle
 			nc.width = oc.width
-			nc.lastMain = rune(0)
+			nc.lastStr = ""
 		}
 	}
 	cb.cells = newc
@@ -223,8 +250,7 @@ func (cb *CellBuffer) Resize(w, h int) {
 func (cb *CellBuffer) Fill(r rune, style Style) {
 	for i := range cb.cells {
 		c := &cb.cells[i]
-		c.currMain = r
-		c.currComb = nil
+		c.currStr = string(r)
 		cs := style
 		if cs.fg == ColorNone {
 			cs.fg = c.currStyle.fg
@@ -236,14 +262,3 @@ func (cb *CellBuffer) Fill(r rune, style Style) {
 		c.width = 1
 	}
 }
-
-var runeConfig *runewidth.Condition
-
-func init() {
-	// The defaults for the runewidth package are poorly chosen for terminal
-	// applications.  We however will honor the setting in the environment if
-	// it is set.
-	if os.Getenv("RUNEWIDTH_EASTASIAN") == "" {
-		runewidth.DefaultCondition.EastAsianWidth = false
-	}
-}
@@ -18,5 +18,5 @@
 package tcell

 func getCharset() string {
-	return "UTF-16"
+	return "UTF-8"
 }
@@ -1,7 +1,7 @@
 //go:build windows
 // +build windows

-// Copyright 2024 The TCell Authors
+// Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use file except in compliance with the License.
@@ -38,7 +38,6 @@ type cScreen struct {
 	cury       int
 	style      Style
 	fini       bool
-	vten       bool
 	truecolor  bool
 	running    bool
 	disableAlt bool // disable the alternate screen
@@ -106,7 +105,6 @@ var winColors = map[Color]Color{
 }

 var (
-	k32 = syscall.NewLazyDLL("kernel32.dll")
 	u32 = syscall.NewLazyDLL("user32.dll")
 )

@@ -117,18 +115,8 @@ var (
 // characters (Unicode) are in use.  The documentation refers to them
 // without this suffix, as the resolution is made via preprocessor.
 var (
-	procReadConsoleInput            = k32.NewProc("ReadConsoleInputW")
-	procWaitForMultipleObjects      = k32.NewProc("WaitForMultipleObjects")
-	procCreateEvent                 = k32.NewProc("CreateEventW")
-	procSetEvent                    = k32.NewProc("SetEvent")
 	procGetConsoleCursorInfo        = k32.NewProc("GetConsoleCursorInfo")
 	procSetConsoleCursorInfo        = k32.NewProc("SetConsoleCursorInfo")
-	procSetConsoleCursorPosition    = k32.NewProc("SetConsoleCursorPosition")
-	procSetConsoleMode              = k32.NewProc("SetConsoleMode")
-	procGetConsoleMode              = k32.NewProc("GetConsoleMode")
-	procGetConsoleScreenBufferInfo  = k32.NewProc("GetConsoleScreenBufferInfo")
-	procFillConsoleOutputAttribute  = k32.NewProc("FillConsoleOutputAttribute")
-	procFillConsoleOutputCharacter  = k32.NewProc("FillConsoleOutputCharacterW")
 	procSetConsoleWindowInfo        = k32.NewProc("SetConsoleWindowInfo")
 	procSetConsoleScreenBufferSize  = k32.NewProc("SetConsoleScreenBufferSize")
 	procSetConsoleTextAttribute     = k32.NewProc("SetConsoleTextAttribute")
@@ -195,6 +183,10 @@ var vtCursorStyles = map[CursorStyle]string{
 // NewConsoleScreen returns a Screen for the Windows console associated
 // with the current process.  The Screen makes use of the Windows Console
 // API to display content and read events.
+//
+// Deprecated: The console API based implementation will be fully replaced
+// with the VT based model.  Use NewScreen() to get a reasonable screen
+// by default.
 func NewConsoleScreen() (Screen, error) {
 	return &baseScreen{screenImpl: &cScreen{}}, nil
 }
@@ -217,22 +209,11 @@ func (s *cScreen) Init() error {

 	s.truecolor = true

-	// ConEmu handling of colors and scrolling when in VT output mode is extremely poor.
-	// The color palette will scroll even though characters do not, when
-	// emitting stuff for the last character.  In the future we might change this to
-	// look at specific versions of ConEmu if they fix the bug.
-	// We can also try disabling auto margin mode.
-	tryVt := true
-	if os.Getenv("ConEmuPID") != "" {
-		s.truecolor = false
-		tryVt = false
-	}
 	switch os.Getenv("TCELL_TRUECOLOR") {
 	case "disable":
 		s.truecolor = false
 	case "enable":
 		s.truecolor = true
-		tryVt = true
 	}

 	s.Lock()
@@ -249,33 +230,17 @@ func (s *cScreen) Init() error {
 	s.fini = false
 	s.setInMode(modeResizeEn | modeExtendFlg)

-	// If a user needs to force old style console, they may do so
-	// by setting TCELL_VTMODE to disable.  This is an undocumented safety net for now.
-	// It may be removed in the future.  (This mostly exists because of ConEmu.)
-	switch os.Getenv("TCELL_VTMODE") {
-	case "disable":
-		tryVt = false
-	case "enable":
-		tryVt = true
-	}
 	switch os.Getenv("TCELL_ALTSCREEN") {
 	case "enable":
 		s.disableAlt = false // also the default
 	case "disable":
 		s.disableAlt = true
 	}
-	if tryVt {
-		s.setOutMode(modeVtOutput | modeNoAutoNL | modeCookedOut | modeUnderline)
-		var om uint32
-		s.getOutMode(&om)
-		if om&modeVtOutput == modeVtOutput {
-			s.vten = true
-		} else {
-			s.truecolor = false
-			s.setOutMode(0)
-		}
-	} else {
-		s.setOutMode(0)
+	s.setOutMode(modeVtOutput | modeNoAutoNL | modeCookedOut | modeUnderline)
+	var om uint32
+	s.getOutMode(&om)
+	if om&modeVtOutput != modeVtOutput {
+		return errors.New("failed to initialize: VT output not supported?")
 	}

 	s.Unlock()
@@ -349,17 +314,12 @@ func (s *cScreen) disengage() {

 	s.wg.Wait()

-	if s.vten {
-		s.emitVtString(vtCursorStyles[CursorStyleDefault])
-		s.emitVtString(vtCursorColorReset)
-		s.emitVtString(vtEnableAm)
-		if !s.disableAlt {
-			s.emitVtString(vtRestoreTitle)
-			s.emitVtString(vtExitCA)
-		}
-	} else if !s.disableAlt {
-		s.clearScreen(StyleDefault, s.vten)
-		s.setCursorPos(0, 0, false)
+	s.emitVtString(vtCursorStyles[CursorStyleDefault])
+	s.emitVtString(vtCursorColorReset)
+	s.emitVtString(vtEnableAm)
+	if !s.disableAlt {
+		s.emitVtString(vtRestoreTitle)
+		s.emitVtString(vtExitCA)
 	}
 	s.setCursorInfo(&s.ocursor)
 	s.setBufferSize(int(s.oscreen.size.x), int(s.oscreen.size.y))
@@ -388,22 +348,18 @@ func (s *cScreen) engage() error {
 	s.running = true
 	s.cancelflag = syscall.Handle(cf)
 	s.enableMouse(s.mouseEnabled)
-
-	if s.vten {
-		s.setOutMode(modeVtOutput | modeNoAutoNL | modeCookedOut | modeUnderline)
-		if !s.disableAlt {
-			s.emitVtString(vtSaveTitle)
-			s.emitVtString(vtEnterCA)
-		}
-		s.emitVtString(vtDisableAm)
-		if s.title != "" {
-			s.emitVtString(fmt.Sprintf(vtSetTitle, s.title))
-		}
-	} else {
-		s.setOutMode(0)
+	s.setInMode(modeVtInput | modeResizeEn | modeExtendFlg)
+	s.setOutMode(modeVtOutput | modeNoAutoNL | modeCookedOut | modeUnderline)
+	if !s.disableAlt {
+		s.emitVtString(vtSaveTitle)
+		s.emitVtString(vtEnterCA)
+	}
+	s.emitVtString(vtDisableAm)
+	if s.title != "" {
+		s.emitVtString(fmt.Sprintf(vtSetTitle, s.title))
 	}

-	s.clearScreen(s.style, s.vten)
+	s.clearScreen(s.style)
 	s.hideCursor()

 	s.cells.Invalidate()
@@ -445,26 +401,18 @@ func (s *cScreen) emitVtString(vs string) {
 }

 func (s *cScreen) showCursor() {
-	if s.vten {
-		s.emitVtString(vtShowCursor)
-		s.emitVtString(vtCursorStyles[s.cursorStyle])
-		if s.cursorColor == ColorReset {
-			s.emitVtString(vtCursorColorReset)
-		} else if s.cursorColor.Valid() {
-			r, g, b := s.cursorColor.RGB()
-			s.emitVtString(fmt.Sprintf(vtCursorColorRGB, r, g, b))
-		}
-	} else {
-		s.setCursorInfo(&cursorInfo{size: 100, visible: 1})
+	s.emitVtString(vtShowCursor)
+	s.emitVtString(vtCursorStyles[s.cursorStyle])
+	if s.cursorColor == ColorReset {
+		s.emitVtString(vtCursorColorReset)
+	} else if s.cursorColor.Valid() {
+		r, g, b := s.cursorColor.RGB()
+		s.emitVtString(fmt.Sprintf(vtCursorColorRGB, r, g, b))
 	}
 }

 func (s *cScreen) hideCursor() {
-	if s.vten {
-		s.emitVtString(vtHideCursor)
-	} else {
-		s.setCursorInfo(&cursorInfo{size: 1, visible: 0})
-	}
+	s.emitVtString(vtHideCursor)
 }

 func (s *cScreen) ShowCursor(x, y int) {
@@ -495,7 +443,7 @@ func (s *cScreen) doCursor() {
 	if x < 0 || y < 0 || x >= s.w || y >= s.h {
 		s.hideCursor()
 	} else {
-		s.setCursorPos(x, y, s.vten)
+		s.setCursorPos(x, y)
 		s.showCursor()
 	}
 }
@@ -504,20 +452,6 @@ func (s *cScreen) HideCursor() {
 	s.ShowCursor(-1, -1)
 }

-type inputRecord struct {
-	typ  uint16
-	_    uint16
-	data [16]byte
-}
-
-const (
-	keyEvent    uint16 = 1
-	mouseEvent  uint16 = 2
-	resizeEvent uint16 = 4
-	menuEvent   uint16 = 8 // don't use
-	focusEvent  uint16 = 16
-)
-
 type mouseRecord struct {
 	x     int16
 	y     int16
@@ -790,6 +724,10 @@ func (s *cScreen) getConsoleInput() error {
 			if krec.ch != 0 {
 				// synthesized key code
 				for krec.repeat > 0 {
+					if krec.ch < ' ' && mod2mask(krec.mod, false) == ModCtrl {
+						krec.ch += '\x60'
+					}
+
 					// convert shift+tab to backtab
 					if mod2mask(krec.mod, false) == ModShift && krec.ch == vkTab {
 						s.postEvent(NewEventKey(KeyBacktab, 0, ModNone))
@@ -861,11 +799,10 @@ func (s *cScreen) scanInput(stopQ chan struct{}) {
 }

 func (s *cScreen) Colors() int {
-	if s.vten {
-		return 1 << 24
+	if !s.truecolor {
+		return 16
 	}
-	// Windows console can display 8 colors, in either low or high intensity
-	return 16
+	return 1 << 24
 }

 var vgaColors = map[Color]uint16{
@@ -1014,20 +951,12 @@ func (s *cScreen) writeString(x, y int, style Style, vtBuf, ch []uint16) {
 		return
 	}

-	if s.vten {
-		vtBuf = append(vtBuf, utf16.Encode([]rune(fmt.Sprintf(vtCursorPos, y+1, x+1)))...)
-		styleStr := s.makeVtStyle(style)
-		vtBuf = append(vtBuf, utf16.Encode([]rune(styleStr))...)
-		vtBuf = append(vtBuf, ch...)
-		_ = syscall.WriteConsole(s.out, &vtBuf[0], uint32(len(vtBuf)), nil, nil)
-		vtBuf = vtBuf[:0]
-	} else {
-		s.setCursorPos(x, y, s.vten)
-		_, _, _ = procSetConsoleTextAttribute.Call(
-			uintptr(s.out),
-			uintptr(s.mapStyle(style)))
-		_ = syscall.WriteConsole(s.out, &ch[0], uint32(len(ch)), nil, nil)
-	}
+	vtBuf = append(vtBuf, utf16.Encode([]rune(fmt.Sprintf(vtCursorPos, y+1, x+1)))...)
+	styleStr := s.makeVtStyle(style)
+	vtBuf = append(vtBuf, utf16.Encode([]rune(styleStr))...)
+	vtBuf = append(vtBuf, ch...)
+	_ = syscall.WriteConsole(s.out, &vtBuf[0], uint32(len(vtBuf)), nil, nil)
+	vtBuf = vtBuf[:0]
 }

 func (s *cScreen) draw() {
@@ -1135,15 +1064,9 @@ func (s *cScreen) setCursorInfo(info *cursorInfo) {
 		uintptr(unsafe.Pointer(info)))
 }

-func (s *cScreen) setCursorPos(x, y int, vtEnable bool) {
-	if vtEnable {
-		// Note that the string is Y first.  Origin is 1,1.
-		s.emitVtString(fmt.Sprintf(vtCursorPos, y+1, x+1))
-	} else {
-		_, _, _ = procSetConsoleCursorPosition.Call(
-			uintptr(s.out),
-			coord{int16(x), int16(y)}.uintptr())
-	}
+func (s *cScreen) setCursorPos(x, y int) {
+	// Note that the string is Y first.  Origin is 1,1.
+	s.emitVtString(fmt.Sprintf(vtCursorPos, y+1, x+1))
 }

 func (s *cScreen) setBufferSize(x, y int) {
@@ -1219,52 +1142,30 @@ func (s *cScreen) resize() {
 	}
 }

-func (s *cScreen) clearScreen(style Style, vtEnable bool) {
-	if vtEnable {
-		s.sendVtStyle(style)
-		row := strings.Repeat(" ", s.w)
-		for y := 0; y < s.h; y++ {
-			s.setCursorPos(0, y, vtEnable)
-			s.emitVtString(row)
-		}
-		s.setCursorPos(0, 0, vtEnable)
-
-	} else {
-		pos := coord{0, 0}
-		attr := s.mapStyle(style)
-		x, y := s.w, s.h
-		scratch := uint32(0)
-		count := uint32(x * y)
-
-		_, _, _ = procFillConsoleOutputAttribute.Call(
-			uintptr(s.out),
-			uintptr(attr),
-			uintptr(count),
-			pos.uintptr(),
-			uintptr(unsafe.Pointer(&scratch)))
-		_, _, _ = procFillConsoleOutputCharacter.Call(
-			uintptr(s.out),
-			uintptr(' '),
-			uintptr(count),
-			pos.uintptr(),
-			uintptr(unsafe.Pointer(&scratch)))
+func (s *cScreen) clearScreen(style Style) {
+	s.sendVtStyle(style)
+	row := strings.Repeat(" ", s.w)
+	for y := 0; y < s.h; y++ {
+		s.setCursorPos(0, y)
+		s.emitVtString(row)
 	}
+	s.setCursorPos(0, 0)
 }

 const (
 	// Input modes
-	modeExtendFlg uint32 = 0x0080
-	modeMouseEn          = 0x0010
-	modeResizeEn         = 0x0008
-	// modeCooked          = 0x0001
-	// modeVtInput         = 0x0200
+	modeExtendFlg = uint32(0x0080)
+	modeMouseEn   = uint32(0x0010)
+	modeResizeEn  = uint32(0x0008)
+	modeVtInput   = uint32(0x0200)
+	// modeCooked    = uint32(0x0001)

 	// Output modes
-	modeCookedOut uint32 = 0x0001
-	modeVtOutput         = 0x0004
-	modeNoAutoNL         = 0x0008
-	modeUnderline        = 0x0010 // ENABLE_LVB_GRID_WORLDWIDE, needed for underlines
-	// modeWrapEOL          = 0x0002
+	modeCookedOut = uint32(0x0001)
+	modeVtOutput  = uint32(0x0004)
+	modeNoAutoNL  = uint32(0x0008)
+	modeUnderline = uint32(0x0010) // ENABLE_LVB_GRID_WORLDWIDE, needed for underlines
+	// modeWrapEOL   = uint32(0x0002)
 )

 func (s *cScreen) setInMode(mode uint32) {
@@ -1300,9 +1201,7 @@ func (s *cScreen) SetStyle(style Style) {
 func (s *cScreen) SetTitle(title string) {
 	s.Lock()
 	s.title = title
-	if s.vten {
-		s.emitVtString(fmt.Sprintf(vtSetTitle, title))
-	}
+	s.emitVtString(fmt.Sprintf(vtSetTitle, title))
 	s.Unlock()
 }

@@ -1333,43 +1232,8 @@ func (s *cScreen) GetClipboard() {

 func (s *cScreen) Resize(int, int, int, int) {}

-func (s *cScreen) HasKey(k Key) bool {
-	// Microsoft has codes for some keys, but they are unusual,
-	// so we don't include them.  We include all the typical
-	// 101, 105 key layout keys.
-	valid := map[Key]bool{
-		KeyBackspace: true,
-		KeyTab:       true,
-		KeyEscape:    true,
-		KeyPause:     true,
-		KeyPrint:     true,
-		KeyPgUp:      true,
-		KeyPgDn:      true,
-		KeyEnter:     true,
-		KeyEnd:       true,
-		KeyHome:      true,
-		KeyLeft:      true,
-		KeyUp:        true,
-		KeyRight:     true,
-		KeyDown:      true,
-		KeyInsert:    true,
-		KeyDelete:    true,
-		KeyF1:        true,
-		KeyF2:        true,
-		KeyF3:        true,
-		KeyF4:        true,
-		KeyF5:        true,
-		KeyF6:        true,
-		KeyF7:        true,
-		KeyF8:        true,
-		KeyF9:        true,
-		KeyF10:       true,
-		KeyF11:       true,
-		KeyF12:       true,
-		KeyRune:      true,
-	}
-
-	return valid[k]
+func (s *cScreen) HasKey(_ Key) bool {
+	return true
 }

 func (s *cScreen) Beep() error {
@@ -0,0 +1,30 @@
+// Copyright 2025 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use file except in compliance with the License.
+// You may obtain a copy of the license at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tcell
+
+import (
+	"os"
+	"strings"
+
+	"github.com/rivo/uniseg"
+)
+
+func init() {
+	if rw := strings.ToLower(os.Getenv("RUNEWIDTH_EASTASIAN")); rw == "1" || rw == "true" || rw == "yes" {
+		uniseg.EastAsianAmbiguousWidth = 2
+	} else {
+		uniseg.EastAsianAmbiguousWidth = 1
+	}
+}
@@ -0,0 +1,886 @@
+// Copyright 2025 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use file except in compliance with the License.
+// You may obtain a copy of the license at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This file describes a generic VT input processor.  It parses key sequences,
+// (input bytes) and loads them into events.  It expects UTF-8 or UTF-16 as the input
+// feed, along with ECMA-48 sequences.  The assumption here is that all potential
+// key sequences are unambiguous between terminal variants (analysis of extant terminfo
+// data appears to support this conjecture). This allows us to implement  this once,
+// in the most efficient and terminal-agnostic way possible.
+//
+// There is unfortunately *one* conflict, with aixterm, for CSI-P - which is KeyDelete
+// in aixterm, but F1 in others.
+
+package tcell
+
+import (
+	"encoding/base64"
+	"os"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+	"unicode/utf16"
+	"unicode/utf8"
+)
+
+type inpState int
+
+const (
+	inpStateInit = inpState(iota)
+	inpStateUtf
+	inpStateEsc
+	inpStateCsi // control sequence introducer
+	inpStateOsc // operating system command
+	inpStateDcs // device control string
+	inpStateSos // start of string (unused)
+	inpStatePm  // privacy message (unused)
+	inpStateApc // application program command
+	inpStateSt  // string terminator
+	inpStateSs2 // single shift 2
+	inpStateSs3 // single shift 3
+	inpStateLFK // linux F-key (not ECMA-48 compliant - bogus CSI)
+)
+
+type InputProcessor interface {
+	ScanUTF8([]byte)
+	ScanUTF16([]uint16)
+	SetSize(rows, cols int)
+}
+
+func NewInputProcessor(eq chan<- Event) InputProcessor {
+	return &inputProcessor{
+		evch: eq,
+		buf:  make([]rune, 0, 128),
+	}
+}
+
+type inputProcessor struct {
+	ut8       []byte
+	ut16      []uint16
+	buf       []rune
+	scratch   []byte
+	csiParams []byte
+	csiInterm []byte
+	escaped   bool
+	btnDown   bool // mouse button tracking for broken terms
+	state     inpState
+	strState  inpState // saved str state (needed for ST)
+	timer     *time.Timer
+	expire    time.Time
+	l         sync.Mutex
+	encBuf    []rune
+	evch      chan<- Event
+	rows      int // used for clipping mouse coordinates
+	cols      int // used for clipping mouse coordinates
+	nested    *inputProcessor
+}
+
+func (ip *inputProcessor) SetSize(w, h int) {
+	if ip.nested != nil {
+		ip.nested.SetSize(w, h)
+		return
+	}
+	go func() {
+		ip.l.Lock()
+		ip.rows = h
+		ip.cols = w
+		ip.post(NewEventResize(w, h))
+		ip.l.Unlock()
+	}()
+}
+func (ip *inputProcessor) post(ev Event) {
+	if ip.escaped {
+		ip.escaped = false
+		if ke, ok := ev.(*EventKey); ok {
+			ev = NewEventKey(ke.Key(), ke.Rune(), ke.Modifiers()|ModAlt)
+		}
+	} else if ke, ok := ev.(*EventKey); ok {
+		switch ke.Key() {
+		case keyPasteStart:
+			ev = NewEventPaste(true)
+		case keyPasteEnd:
+			ev = NewEventPaste(false)
+		}
+	}
+
+	ip.evch <- ev
+}
+
+func (ip *inputProcessor) escTimeout() {
+	ip.l.Lock()
+	defer ip.l.Unlock()
+	if ip.state == inpStateEsc && ip.expire.Before(time.Now()) {
+		// post it
+		ip.state = inpStateInit
+		ip.escaped = false
+		ip.post(NewEventKey(KeyEsc, 0, ModNone))
+	}
+}
+
+type csiParamMode struct {
+	M rune // Mode
+	P int  // Parameter (first)
+}
+
+type keyMap struct {
+	Key Key
+	Mod ModMask
+}
+
+var csiAllKeys = map[csiParamMode]keyMap{
+	{M: 'A'}:         {Key: KeyUp},
+	{M: 'B'}:         {Key: KeyDown},
+	{M: 'C'}:         {Key: KeyRight},
+	{M: 'D'}:         {Key: KeyLeft},
+	{M: 'F'}:         {Key: KeyEnd},
+	{M: 'H'}:         {Key: KeyHome},
+	{M: 'L'}:         {Key: KeyInsert},
+	{M: 'P'}:         {Key: KeyF1}, // except for aixterm, where this is Delete
+	{M: 'Q'}:         {Key: KeyF2},
+	{M: 'S'}:         {Key: KeyF4},
+	{M: 'Z'}:         {Key: KeyBacktab},
+	{M: 'a'}:         {Key: KeyUp, Mod: ModShift},
+	{M: 'b'}:         {Key: KeyDown, Mod: ModShift},
+	{M: 'c'}:         {Key: KeyRight, Mod: ModShift},
+	{M: 'd'}:         {Key: KeyLeft, Mod: ModShift},
+	{M: 'q', P: 1}:   {Key: KeyF1}, // all these 'q' are for aixterm
+	{M: 'q', P: 2}:   {Key: KeyF2},
+	{M: 'q', P: 3}:   {Key: KeyF3},
+	{M: 'q', P: 4}:   {Key: KeyF4},
+	{M: 'q', P: 5}:   {Key: KeyF5},
+	{M: 'q', P: 6}:   {Key: KeyF6},
+	{M: 'q', P: 7}:   {Key: KeyF7},
+	{M: 'q', P: 8}:   {Key: KeyF8},
+	{M: 'q', P: 9}:   {Key: KeyF9},
+	{M: 'q', P: 10}:  {Key: KeyF10},
+	{M: 'q', P: 11}:  {Key: KeyF11},
+	{M: 'q', P: 12}:  {Key: KeyF12},
+	{M: 'q', P: 13}:  {Key: KeyF13},
+	{M: 'q', P: 14}:  {Key: KeyF14},
+	{M: 'q', P: 15}:  {Key: KeyF15},
+	{M: 'q', P: 16}:  {Key: KeyF16},
+	{M: 'q', P: 17}:  {Key: KeyF17},
+	{M: 'q', P: 18}:  {Key: KeyF18},
+	{M: 'q', P: 19}:  {Key: KeyF19},
+	{M: 'q', P: 20}:  {Key: KeyF20},
+	{M: 'q', P: 21}:  {Key: KeyF21},
+	{M: 'q', P: 22}:  {Key: KeyF22},
+	{M: 'q', P: 23}:  {Key: KeyF23},
+	{M: 'q', P: 24}:  {Key: KeyF24},
+	{M: 'q', P: 25}:  {Key: KeyF25},
+	{M: 'q', P: 26}:  {Key: KeyF26},
+	{M: 'q', P: 27}:  {Key: KeyF27},
+	{M: 'q', P: 28}:  {Key: KeyF28},
+	{M: 'q', P: 29}:  {Key: KeyF29},
+	{M: 'q', P: 30}:  {Key: KeyF30},
+	{M: 'q', P: 31}:  {Key: KeyF31},
+	{M: 'q', P: 32}:  {Key: KeyF32},
+	{M: 'q', P: 33}:  {Key: KeyF33},
+	{M: 'q', P: 34}:  {Key: KeyF34},
+	{M: 'q', P: 35}:  {Key: KeyF35},
+	{M: 'q', P: 36}:  {Key: KeyF36},
+	{M: 'q', P: 144}: {Key: KeyClear},
+	{M: 'q', P: 146}: {Key: KeyEnd},
+	{M: 'q', P: 150}: {Key: KeyPgUp},
+	{M: 'q', P: 154}: {Key: KeyPgDn},
+	{M: 'z', P: 214}: {Key: KeyHome},
+	{M: 'z', P: 216}: {Key: KeyPgUp},
+	{M: 'z', P: 220}: {Key: KeyEnd},
+	{M: 'z', P: 222}: {Key: KeyPgDn},
+	{M: 'z', P: 224}: {Key: KeyF1},
+	{M: 'z', P: 225}: {Key: KeyF2},
+	{M: 'z', P: 226}: {Key: KeyF3},
+	{M: 'z', P: 227}: {Key: KeyF4},
+	{M: 'z', P: 228}: {Key: KeyF5},
+	{M: 'z', P: 229}: {Key: KeyF6},
+	{M: 'z', P: 230}: {Key: KeyF7},
+	{M: 'z', P: 231}: {Key: KeyF8},
+	{M: 'z', P: 232}: {Key: KeyF9},
+	{M: 'z', P: 233}: {Key: KeyF10},
+	{M: 'z', P: 234}: {Key: KeyF11},
+	{M: 'z', P: 235}: {Key: KeyF12},
+	{M: 'z', P: 247}: {Key: KeyInsert},
+	{M: '^', P: 7}:   {Key: KeyHome, Mod: ModCtrl},
+	{M: '^', P: 8}:   {Key: KeyEnd, Mod: ModCtrl},
+	{M: '^', P: 11}:  {Key: KeyF23},
+	{M: '^', P: 12}:  {Key: KeyF24},
+	{M: '^', P: 13}:  {Key: KeyF25},
+	{M: '^', P: 14}:  {Key: KeyF26},
+	{M: '^', P: 15}:  {Key: KeyF27},
+	{M: '^', P: 17}:  {Key: KeyF28}, // 16 is a gap
+	{M: '^', P: 18}:  {Key: KeyF29},
+	{M: '^', P: 19}:  {Key: KeyF30},
+	{M: '^', P: 20}:  {Key: KeyF31},
+	{M: '^', P: 21}:  {Key: KeyF32},
+	{M: '^', P: 23}:  {Key: KeyF33}, // 22 is a gap
+	{M: '^', P: 24}:  {Key: KeyF34},
+	{M: '^', P: 25}:  {Key: KeyF35},
+	{M: '^', P: 26}:  {Key: KeyF36}, // 27 is a gap
+	{M: '^', P: 28}:  {Key: KeyF37},
+	{M: '^', P: 29}:  {Key: KeyF38}, // 30 is a gap
+	{M: '^', P: 31}:  {Key: KeyF39},
+	{M: '^', P: 32}:  {Key: KeyF40},
+	{M: '^', P: 33}:  {Key: KeyF41},
+	{M: '^', P: 34}:  {Key: KeyF42},
+	{M: '@', P: 23}:  {Key: KeyF43},
+	{M: '@', P: 24}:  {Key: KeyF44},
+	{M: '$', P: 2}:   {Key: KeyInsert, Mod: ModShift},
+	{M: '$', P: 3}:   {Key: KeyDelete, Mod: ModShift},
+	{M: '$', P: 7}:   {Key: KeyHome, Mod: ModShift},
+	{M: '$', P: 8}:   {Key: KeyEnd, Mod: ModShift},
+	{M: '$', P: 23}:  {Key: KeyF21},
+	{M: '$', P: 24}:  {Key: KeyF22},
+	{M: '~', P: 1}:   {Key: KeyHome},
+	{M: '~', P: 2}:   {Key: KeyInsert},
+	{M: '~', P: 3}:   {Key: KeyDelete},
+	{M: '~', P: 4}:   {Key: KeyEnd},
+	{M: '~', P: 5}:   {Key: KeyPgUp},
+	{M: '~', P: 6}:   {Key: KeyPgDn},
+	{M: '~', P: 7}:   {Key: KeyHome},
+	{M: '~', P: 8}:   {Key: KeyEnd},
+	{M: '~', P: 11}:  {Key: KeyF1},
+	{M: '~', P: 12}:  {Key: KeyF2},
+	{M: '~', P: 13}:  {Key: KeyF3},
+	{M: '~', P: 14}:  {Key: KeyF4},
+	{M: '~', P: 15}:  {Key: KeyF5},
+	{M: '~', P: 17}:  {Key: KeyF6},
+	{M: '~', P: 18}:  {Key: KeyF7},
+	{M: '~', P: 19}:  {Key: KeyF8},
+	{M: '~', P: 20}:  {Key: KeyF9},
+	{M: '~', P: 21}:  {Key: KeyF10},
+	{M: '~', P: 23}:  {Key: KeyF11},
+	{M: '~', P: 24}:  {Key: KeyF12},
+	{M: '~', P: 25}:  {Key: KeyF13},
+	{M: '~', P: 26}:  {Key: KeyF14},
+	{M: '~', P: 28}:  {Key: KeyF15}, // aka KeyHelp
+	{M: '~', P: 29}:  {Key: KeyF16},
+	{M: '~', P: 31}:  {Key: KeyF17},
+	{M: '~', P: 32}:  {Key: KeyF18},
+	{M: '~', P: 33}:  {Key: KeyF19},
+	{M: '~', P: 34}:  {Key: KeyF20},
+	{M: '~', P: 200}: {Key: keyPasteStart},
+	{M: '~', P: 201}: {Key: keyPasteEnd},
+}
+
+// keys reported using Kitty csi-u protocol
+var csiUKeys = map[int]Key{
+	27:    KeyESC,
+	9:     KeyTAB,
+	13:    KeyEnter,
+	127:   KeyBS,
+	57358: KeyCapsLock,
+	57359: KeyScrollLock,
+	57360: KeyNumLock,
+	57361: KeyPrint,
+	57362: KeyPause,
+	57363: KeyMenu,
+	57376: KeyF13,
+	57377: KeyF14,
+	57378: KeyF15,
+	57379: KeyF16,
+	57380: KeyF17,
+	57381: KeyF18,
+	57382: KeyF19,
+	57383: KeyF20,
+	57384: KeyF21,
+	57385: KeyF22,
+	57386: KeyF23,
+	57387: KeyF24,
+	57388: KeyF25,
+	57389: KeyF26,
+	57390: KeyF27,
+	57391: KeyF28,
+	57392: KeyF29,
+	57393: KeyF30,
+	57394: KeyF31,
+	57395: KeyF32,
+	57396: KeyF33,
+	57397: KeyF34,
+	57398: KeyF35,
+	// TODO: KP keys
+	// TODO: Media keys
+}
+
+// windows virtual key codes per microsoft
+var winKeys = map[int]Key{
+	0x03: KeyCancel,    // vkCancel
+	0x08: KeyBackspace, // vkBackspace
+	0x09: KeyTab,       // vkTab
+	0x0d: KeyEnter,     // vkReturn
+	0x12: KeyClear,     // vClear
+	0x13: KeyPause,     // vkPause
+	0x1b: KeyEscape,    // vkEscape
+	0x21: KeyPgUp,      // vkPrior
+	0x22: KeyPgDn,      // vkNext
+	0x23: KeyEnd,       // vkEnd
+	0x24: KeyHome,      // vkHome
+	0x25: KeyLeft,      // vkLeft
+	0x26: KeyUp,        // vkUp
+	0x27: KeyRight,     // vkRight
+	0x28: KeyDown,      // vkDown
+	0x2a: KeyPrint,     // vkPrint
+	0x2c: KeyPrint,     // vkPrtScr
+	0x2d: KeyInsert,    // vkInsert
+	0x2e: KeyDelete,    // vkDelete
+	0x2f: KeyHelp,      // vkHelp
+	0x70: KeyF1,        // vkF1
+	0x71: KeyF2,        // vkF2
+	0x72: KeyF3,        // vkF3
+	0x73: KeyF4,        // vkF4
+	0x74: KeyF5,        // vkF5
+	0x75: KeyF6,        // vkF6
+	0x76: KeyF7,        // vkF7
+	0x77: KeyF8,        // vkF8
+	0x78: KeyF9,        // vkF9
+	0x79: KeyF10,       // vkF10
+	0x7a: KeyF11,       // vkF11
+	0x7b: KeyF12,       // vkF12
+	0x7c: KeyF13,       // vkF13
+	0x7d: KeyF14,       // vkF14
+	0x7e: KeyF15,       // vkF15
+	0x7f: KeyF16,       // vkF16
+	0x80: KeyF17,       // vkF17
+	0x81: KeyF18,       // vkF18
+	0x82: KeyF19,       // vkF19
+	0x83: KeyF20,       // vkF20
+	0x84: KeyF21,       // vkF21
+	0x85: KeyF22,       // vkF22
+	0x86: KeyF23,       // vkF23
+	0x87: KeyF24,       // vkF24
+}
+
+// keys by their SS3 - used in application mode usually (legacy VT-style)
+var ss3Keys = map[rune]Key{
+	'A': KeyUp,
+	'B': KeyDown,
+	'C': KeyRight,
+	'D': KeyLeft,
+	'F': KeyEnd,
+	'H': KeyHome,
+	'P': KeyF1,
+	'Q': KeyF2,
+	'R': KeyF3,
+	'S': KeyF4,
+	't': KeyF5,
+	'u': KeyF6,
+	'v': KeyF7,
+	'l': KeyF8,
+	'w': KeyF9,
+	'x': KeyF10,
+}
+
+// linux terminal uses these non ECMA keys prefixed by CSI-[
+var linuxFKeys = map[rune]Key{
+	'A': KeyF1,
+	'B': KeyF2,
+	'C': KeyF3,
+	'D': KeyF4,
+	'E': KeyF5,
+}
+
+func (ip *inputProcessor) scan() {
+	for _, r := range ip.buf {
+		ip.buf = ip.buf[1:]
+		if r > 0x7F {
+			// 8-bit extended Unicode we just treat as such - this will swallow anything else queued up
+			ip.state = inpStateInit
+			ip.post(NewEventKey(KeyRune, r, ModNone))
+			continue
+		}
+		switch ip.state {
+		case inpStateInit:
+			switch r {
+			case '\x1b':
+				// escape.. pending
+				ip.state = inpStateEsc
+				if len(ip.buf) == 0 && ip.nested == nil {
+					ip.expire = time.Now().Add(time.Millisecond * 50)
+					ip.timer = time.AfterFunc(time.Millisecond*60, ip.escTimeout)
+				}
+			case '\t':
+				ip.post(NewEventKey(KeyTab, 0, ModNone))
+			case '\b', '\x7F':
+				ip.post(NewEventKey(KeyBackspace, 0, ModNone))
+			case '\r':
+				ip.post(NewEventKey(KeyEnter, 0, ModNone))
+			default:
+				// Control keys - legacy handling
+				if r < ' ' {
+					ip.post(NewEventKey(KeyCtrlSpace+Key(r), 0, ModCtrl))
+				} else {
+					ip.post(NewEventKey(KeyRune, r, ModNone))
+				}
+			}
+		case inpStateEsc:
+			switch r {
+			case '[':
+				ip.state = inpStateCsi
+				ip.csiInterm = nil
+				ip.csiParams = nil
+			case ']':
+				ip.state = inpStateOsc
+				ip.scratch = nil
+			case 'N':
+				ip.state = inpStateSs2 // no known uses
+				ip.scratch = nil
+			case 'O':
+				ip.state = inpStateSs3
+				ip.scratch = nil
+			case 'X':
+				ip.state = inpStateSos
+				ip.scratch = nil
+			case '^':
+				ip.state = inpStatePm
+				ip.scratch = nil
+			case '_':
+				ip.state = inpStateApc
+				ip.scratch = nil
+			case '\\':
+				// string terminator reached, (orphaned?)
+				ip.state = inpStateInit
+			case '\t':
+				// Linux console only, does not conform to ECMA
+				ip.state = inpStateInit
+				ip.post(NewEventKey(KeyBacktab, 0, ModNone))
+			default:
+				if r == '\x1b' {
+					// leading ESC to capture alt
+					ip.escaped = true
+				} else {
+					// treat as alt-key ... legacy emulators only (no CSI-u or other)
+					ip.state = inpStateInit
+					mod := ModAlt
+					if r < ' ' {
+						mod |= ModCtrl
+						r += 0x60
+					}
+					ip.post(NewEventKey(KeyRune, r, mod))
+				}
+			}
+		case inpStateCsi:
+			// usual case for incoming keys
+			if r >= 0x30 && r <= 0x3F { // parameter bytes
+				ip.csiParams = append(ip.csiParams, byte(r))
+			} else if r >= 0x20 && r <= 0x2F { // intermediate bytes, rarely used
+				ip.csiInterm = append(ip.csiInterm, byte(r))
+			} else if r >= 0x40 && r <= 0x7F { // final byte
+				ip.handleCsi(r, ip.csiParams, ip.csiInterm)
+			} else {
+				// bad parse, just swallow it all
+				ip.state = inpStateInit
+			}
+		case inpStateSs2:
+			// No known uses for SS2
+			ip.state = inpStateInit
+
+		case inpStateSs3: // typically application mode keys or older terminals
+			ip.state = inpStateInit
+			if k, ok := ss3Keys[r]; ok {
+				ip.post(NewEventKey(k, 0, ModNone))
+			}
+
+		case inpStatePm, inpStateApc, inpStateSos, inpStateDcs: // these we just eat
+			switch r {
+			case '\x1b':
+				ip.strState = ip.state
+				ip.state = inpStateSt
+			case '\x07': // bell - some send this instead of ST
+				ip.state = inpStateInit
+			}
+
+		case inpStateOsc: // not sure if used
+			switch r {
+			case '\x1b':
+				ip.strState = ip.state
+				ip.state = inpStateSt
+			case '\x07':
+				ip.handleOsc(string(ip.scratch))
+			default:
+				ip.scratch = append(ip.scratch, byte(r&0x7f))
+			}
+		case inpStateSt:
+			if r == '\\' || r == '\x07' {
+				ip.state = inpStateInit
+				switch ip.strState {
+				case inpStateOsc:
+					ip.handleOsc(string(ip.scratch))
+				case inpStatePm, inpStateApc, inpStateSos, inpStateDcs:
+					ip.state = inpStateInit
+				}
+			} else {
+				ip.scratch = append(ip.scratch, '\x1b', byte(r))
+				ip.state = ip.strState
+			}
+		case inpStateLFK:
+			// linux console does not follow ECMA
+			if k, ok := linuxFKeys[r]; ok {
+				ip.post(NewEventKey(k, 0, ModNone))
+			}
+			ip.state = inpStateInit
+		}
+	}
+}
+
+func (ip *inputProcessor) handleOsc(str string) {
+	ip.state = inpStateInit
+	if content, ok := strings.CutPrefix(str, "52;c;"); ok {
+		decoded := make([]byte, base64.StdEncoding.DecodedLen(len(content)))
+		if count, err := base64.StdEncoding.Decode(decoded, []byte(content)); err == nil {
+			ip.post(NewEventClipboard(decoded[:count]))
+			return
+		}
+	}
+}
+
+func calcModifier(n int) ModMask {
+	n--
+	m := ModNone
+	if n&1 != 0 {
+		m |= ModShift
+	}
+	if n&2 != 0 {
+		m |= ModAlt
+	}
+	if n&4 != 0 {
+		m |= ModCtrl
+	}
+	if n&8 != 0 {
+		m |= ModMeta // kitty calls this Super
+	}
+	if n&16 != 0 {
+		m |= ModHyper
+	}
+	if n&32 != 0 {
+		m |= ModMeta // for now not separating from Super
+	}
+	// Not doing (kitty only):
+	// caps_lock 0b1000000   (64)
+	// num_lock  0b10000000  (128)
+
+	return m
+}
+
+// func (ip *inputProcessor) handleMouse(x, y, btn int, down bool) *EventMouse {
+func (ip *inputProcessor) handleMouse(mode rune, params []int) {
+
+	// XTerm mouse events only report at most one button at a time,
+	// which may include a wheel button.  Wheel motion events are
+	// reported as single impulses, while other button events are reported
+	// as separate press & release events.
+	if len(params) < 3 {
+		return
+	}
+	btn := params[0]
+	// Some terminals will report mouse coordinates outside the
+	// screen, especially with click-drag events.  Clip the coordinates
+	// to the screen in that case.
+	x := max(min(params[1]-1, ip.cols-1), 0)
+	y := max(min(params[2]-1, ip.rows-1), 0)
+	motion := (btn & 0x20) != 0
+	scroll := (btn & 0x42) == 0x40
+	btn &^= 0x20
+	if mode == 'm' {
+		// mouse release, clear all buttons
+		btn |= 3
+		btn &^= 0x40
+		ip.btnDown = false
+	} else if motion {
+		/*
+		 * Some broken terminals appear to send
+		 * mouse button one motion events, instead of
+		 * encoding 35 (no buttons) into these events.
+		 * We resolve these by looking for a non-motion
+		 * event first.
+		 */
+		if !ip.btnDown {
+			btn |= 3
+			btn &^= 0x40
+		}
+	} else if !scroll {
+		ip.btnDown = true
+	}
+
+	button := ButtonNone
+	mod := ModNone
+
+	// Mouse wheel has bit 6 set, no release events.  It should be noted
+	// that wheel events are sometimes misdelivered as mouse button events
+	// during a click-drag, so we debounce these, considering them to be
+	// button press events unless we see an intervening release event.
+	switch btn & 0x43 {
+	case 0:
+		button = Button1
+	case 1:
+		button = Button3 // Note we prefer to treat right as button 2
+	case 2:
+		button = Button2 // And the middle button as button 3
+	case 3:
+		button = ButtonNone
+	case 0x40:
+		button = WheelUp
+	case 0x41:
+		button = WheelDown
+	case 0x42:
+		button = WheelLeft
+	case 0x43:
+		button = WheelRight
+	}
+
+	if btn&0x4 != 0 {
+		mod |= ModShift
+	}
+	if btn&0x8 != 0 {
+		mod |= ModAlt
+	}
+	if btn&0x10 != 0 {
+		mod |= ModCtrl
+	}
+
+	ip.post(NewEventMouse(x, y, button, mod))
+}
+
+func (ip *inputProcessor) handleWinKey(P []int) {
+	// win32-input-mode
+	//  ^[ [ Vk ; Sc ; Uc ; Kd ; Cs ; Rc _
+	// Vk: the value of wVirtualKeyCode - any number. If omitted, defaults to '0'.
+	// Sc: the value of wVirtualScanCode - any number. If omitted, defaults to '0'.
+	// Uc: the decimal value of UnicodeChar - for example, NUL is "0", LF is
+	//     "10", the character 'A' is "65". If omitted, defaults to '0'.
+	// Kd: the value of bKeyDown - either a '0' or '1'. If omitted, defaults to '0'.
+	// Cs: the value of dwControlKeyState - any number. If omitted, defaults to '0'.
+	// Rc: the value of wRepeatCount - any number. If omitted, defaults to '1'.
+	//
+	// Note that some 3rd party terminal emulators (not Terminal) suffer from a bug
+	// where other events, such as mouse events, are doubly encoded, using Vk 0
+	// for each character.  (So a CSI-M sequence is encoded as a series of CSI-_
+	// sequences.)  We consider this a bug in those terminal emulators -- Windows 11
+	// Terminal does not suffer this brain damage. (We've observed this with both Alacritty
+	// and WezTerm.)
+	for len(P) < 6 {
+		P = append(P, 0) // ensure sufficient length
+	}
+	if P[3] == 0 {
+		// key up event ignore ignore
+		return
+	}
+
+	if P[0] == 0 && P[1] == 0 && P[2] > 0 && P[2] < 0x80 { // only ASCII in win32-input-mode
+		if ip.nested == nil {
+			ip.nested = &inputProcessor{
+				evch: ip.evch,
+				rows: ip.rows,
+				cols: ip.cols,
+			}
+		}
+
+		ip.nested.ScanUTF8([]byte{byte(P[2])})
+		return
+	}
+
+	key := KeyRune
+	chr := rune(P[2])
+	mod := ModNone
+	rpt := max(1, P[5])
+	if k1, ok := winKeys[P[0]]; ok {
+		chr = 0
+		key = k1
+	} else if chr == 0 && P[0] >= 0x30 && P[0] <= 0x39 {
+		chr = rune(P[0])
+	} else if chr < ' ' && P[0] >= 0x41 && P[0] <= 0x5a {
+		key = Key(P[0])
+		chr = 0
+	} else if key == 0x11 || key == 0x13 || key == 0x14 {
+		// lone modifiers
+		return
+	}
+
+	// Modifiers
+	if P[4]&0x010 != 0 {
+		mod |= ModShift
+	}
+	if P[4]&0x000c != 0 {
+		mod |= ModCtrl
+	}
+	if P[4]&0x0003 != 0 {
+		mod |= ModAlt
+	}
+	if key == KeyRune && chr > ' ' && mod == ModShift {
+		// filter out lone shift for printable chars
+		mod = ModNone
+	}
+	if chr != 0 && mod&(ModCtrl|ModAlt) == ModCtrl|ModAlt {
+		// Filter out ctrl+alt (it means AltGr)
+		mod = ModNone
+	}
+
+	for range rpt {
+		if key != KeyRune || chr != 0 {
+			ip.post(NewEventKey(key, chr, mod))
+		}
+	}
+}
+
+func (ip *inputProcessor) handleCsi(mode rune, params []byte, intermediate []byte) {
+
+	// reset state
+	ip.state = inpStateInit
+
+	if len(intermediate) != 0 {
+		// we don't know what to do with these for now
+		return
+	}
+
+	var parts []string
+	var P []int
+	hasLT := false
+	pstr := string(params)
+	// extract numeric parameters
+	if strings.HasPrefix(pstr, "<") {
+		hasLT = true
+		pstr = pstr[1:]
+	}
+	if pstr != "" && pstr[0] >= '0' && pstr[0] <= '9' {
+		parts = strings.Split(pstr, ";")
+		for i := range parts {
+			if parts[i] != "" {
+				if n, e := strconv.ParseInt(parts[i], 10, 32); e == nil {
+					P = append(P, int(n))
+				}
+			}
+		}
+	}
+	var P0 int
+	if len(P) > 0 {
+		P0 = P[0]
+	}
+
+	if hasLT {
+		switch mode {
+		case 'm', 'M': // mouse event, we only do SGR tracking
+			ip.handleMouse(mode, P)
+		}
+	}
+
+	switch mode {
+	case 'I': // focus in
+		ip.post(NewEventFocus(true))
+		return
+	case 'O': // focus out
+		ip.post(NewEventFocus(false))
+		return
+	case '[':
+		// linux console F-key - CSI-[ modifies next key
+		ip.state = inpStateLFK
+		return
+	case 'u':
+		// CSI-u kitty keyboard protocol
+		if len(P) > 0 && !hasLT {
+			mod := ModNone
+			key := KeyRune
+			chr := rune(0)
+			if k1, ok := csiUKeys[P0]; ok {
+				key = k1
+				chr = 0
+			} else {
+				chr = rune(P0)
+			}
+			if len(P) > 1 {
+				mod = calcModifier(P[1])
+			}
+			ip.post(NewEventKey(key, chr, mod))
+		}
+		return
+	case '_':
+		if len(intermediate) == 0 && len(P) > 0 {
+			ip.handleWinKey(P)
+			return
+		}
+	case '~':
+		if len(intermediate) == 0 && len(P) >= 2 {
+			mod := calcModifier(P[1])
+			if ks, ok := csiAllKeys[csiParamMode{M: mode, P: P0}]; ok {
+				ip.post(NewEventKey(ks.Key, 0, mod))
+				return
+			}
+			if P0 == 27 && len(P) > 2 && P[2] > 0 && P[2] <= 0xff {
+				if P[2] < ' ' || P[2] == 0x7F {
+					ip.post(NewEventKey(Key(P[2]), 0, mod))
+				} else {
+					ip.post(NewEventKey(KeyRune, rune(P[2]), mod))
+				}
+				return
+			}
+		}
+	}
+
+	if ks, ok := csiAllKeys[csiParamMode{M: mode, P: P0}]; ok && !hasLT {
+		if mode == '~' && len(P) > 1 && ks.Mod == ModNone {
+			// apply modifiers if present
+			ks.Mod = calcModifier(P[1])
+		} else if mode == 'P' && os.Getenv("TERM") == "aixterm" {
+			ks.Key = KeyDelete // aixterm hack - conflicts with kitty protocol
+		}
+		ip.post(NewEventKey(ks.Key, 0, ks.Mod))
+		return
+	}
+
+	// this might have been an SS3 style key with modifiers applied
+	if k, ok := ss3Keys[mode]; ok && P0 == 1 && len(P) > 1 {
+		ip.post(NewEventKey(k, 0, calcModifier(P[1])))
+		return
+	}
+	// if we got here we just swallow the unknown sequence
+}
+
+func (ip *inputProcessor) ScanUTF8(b []byte) {
+	ip.l.Lock()
+	defer ip.l.Unlock()
+
+	ip.ut8 = append(ip.ut8, b...)
+	for len(ip.ut8) > 0 {
+		// fast path, basic ascii
+		if ip.ut8[0] < 0x7F {
+			ip.buf = append(ip.buf, rune(ip.ut8[0]))
+			ip.ut8 = ip.ut8[1:]
+		} else {
+			r, len := utf8.DecodeRune(ip.ut8)
+			if r == utf8.RuneError {
+				r = rune(ip.ut8[0])
+				len = 1
+			}
+			ip.buf = append(ip.buf, r)
+			ip.ut8 = ip.ut8[len:]
+		}
+	}
+
+	ip.scan()
+}
+
+func (ip *inputProcessor) ScanUTF16(u []uint16) {
+	ip.l.Lock()
+	defer ip.l.Unlock()
+	ip.ut16 = append(ip.ut16, u...)
+	for len(ip.ut16) > 0 {
+		if !utf16.IsSurrogate(rune(ip.ut16[0])) {
+			ip.buf = append(ip.buf, rune(ip.ut16[0]))
+			ip.ut16 = ip.ut16[1:]
+		} else if len(ip.ut16) > 1 {
+			ip.buf = append(ip.buf, utf16.DecodeRune(rune(ip.ut16[0]), rune(ip.ut16[1])))
+			ip.ut16 = ip.ut16[2:]
+		} else {
+			break
+		}
+	}
+}
@@ -1,4 +1,4 @@
-// Copyright 2016 The TCell Authors
+// Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use file except in compliance with the License.
@@ -171,6 +171,11 @@ var KeyNames = map[Key]string{
 	KeyF62:            "F62",
 	KeyF63:            "F63",
 	KeyF64:            "F64",
+	KeyMenu:           "Menu",
+	KeyCapsLock:       "CapsLock",
+	KeyScrollLock:     "ScrollLock",
+	KeyNumLock:        "NumLock",
+	KeyCtrlSpace:      "Ctrl-Space",
 	KeyCtrlA:          "Ctrl-A",
 	KeyCtrlB:          "Ctrl-B",
 	KeyCtrlC:          "Ctrl-C",
@@ -178,9 +183,12 @@ var KeyNames = map[Key]string{
 	KeyCtrlE:          "Ctrl-E",
 	KeyCtrlF:          "Ctrl-F",
 	KeyCtrlG:          "Ctrl-G",
+	KeyCtrlH:          "Ctrl-H",
+	KeyCtrlI:          "Ctrl-I",
 	KeyCtrlJ:          "Ctrl-J",
 	KeyCtrlK:          "Ctrl-K",
 	KeyCtrlL:          "Ctrl-L",
+	KeyCtrlM:          "Ctrl-M",
 	KeyCtrlN:          "Ctrl-N",
 	KeyCtrlO:          "Ctrl-O",
 	KeyCtrlP:          "Ctrl-P",
@@ -194,11 +202,11 @@ var KeyNames = map[Key]string{
 	KeyCtrlX:          "Ctrl-X",
 	KeyCtrlY:          "Ctrl-Y",
 	KeyCtrlZ:          "Ctrl-Z",
-	KeyCtrlSpace:      "Ctrl-Space",
-	KeyCtrlUnderscore: "Ctrl-_",
+	KeyCtrlLeftSq:     "Ctrl-[",
 	KeyCtrlRightSq:    "Ctrl-]",
 	KeyCtrlBackslash:  "Ctrl-\\",
 	KeyCtrlCarat:      "Ctrl-^",
+	KeyCtrlUnderscore: "Ctrl-_",
 }

 // Name returns a printable value or the key stroke.  This can be used
@@ -218,6 +226,9 @@ func (ev *EventKey) Name() string {
 	if ev.mod&ModCtrl != 0 {
 		m = append(m, "Ctrl")
 	}
+	if ev.mod&ModHyper != 0 {
+		m = append(m, "Hyper")
+	}

 	ok := false
 	if s, ok = KeyNames[ev.key]; !ok {
@@ -246,15 +257,52 @@ func NewEventKey(k Key, ch rune, mod ModMask) *EventKey {
 		// control characters and the DEL.
 		k = Key(ch)
 		if mod == ModNone && ch < ' ' {
-			switch Key(ch) {
+			switch k {
 			case KeyBackspace, KeyTab, KeyEsc, KeyEnter:
 				// these keys are directly typeable without CTRL
 			default:
 				// most likely entered with a CTRL keypress
 				mod = ModCtrl
 			}
+			ch = ch + '\x60'
 		}
 	}
+	if k == KeyRune && ch >= 'A' && ch <= 'Z' && mod == ModCtrl {
+		// We don't do Ctrl-[ or backslash or those specially.
+		k = KeyCtrlA + Key(ch-'A')
+	}
+
+	// Might be lower case
+	if k == KeyRune && ch >= 'a' && ch <= 'z' && mod == ModCtrl {
+		// We don't do Ctrl-[ or backslash or those specially.
+		k = KeyCtrlA + Key(ch-'a')
+	}
+
+	// Windows reports ModShift for shifted keys.  This is inconsistent
+	// with UNIX, lets harmonize this.
+	if k == KeyRune && mod == ModShift && ch != 0 {
+		mod = ModNone
+	}
+
+	if k >= KeyCtrlA && k <= KeyCtrlZ {
+		if mod&ModShift != 0 {
+			ch = rune((k - KeyCtrlA) + 'A')
+		} else {
+			ch = rune((k - KeyCtrlA) + 'a')
+		}
+	}
+
+	// Backspace2 is just another name for backspace.
+	if k == KeyBackspace2 {
+		k = KeyBackspace
+	}
+
+	// Shift-Tab should be Backtab.
+	if k == KeyTab && (mod&ModShift) != 0 {
+		k = KeyBacktab
+		mod &^= ModShift
+	}
+
 	return &EventKey{t: time.Now(), key: k, ch: ch, mod: mod}
 }

@@ -272,6 +320,7 @@ const (
 	ModCtrl
 	ModAlt
 	ModMeta
+	ModHyper
 	ModNone ModMask = 0
 )

@@ -373,6 +422,10 @@ const (
 	KeyF62
 	KeyF63
 	KeyF64
+	KeyMenu
+	KeyCapsLock
+	KeyScrollLock
+	KeyNumLock
 )

 const (
@@ -381,10 +434,12 @@ const (
 	keyPasteEnd
 )

-// These are the control keys.  Note that they overlap with other keys,
-// perhaps.  For example, KeyCtrlH is the same as KeyBackspace.
+// These are the control keys, they will also be reported with the
+// rune (lower case) and control modifier.  If the shift key
+// or other modifiers are present then these will *NOT* be reported,
+// but reported instead as KeyRune.
 const (
-	KeyCtrlSpace Key = iota
+	KeyCtrlSpace Key = iota + 64
 	KeyCtrlA
 	KeyCtrlB
 	KeyCtrlC
@@ -461,10 +516,12 @@ const (

 // These keys are aliases for other names.
 const (
-	KeyBackspace  = KeyBS
-	KeyTab        = KeyTAB
-	KeyEsc        = KeyESC
-	KeyEscape     = KeyESC
-	KeyEnter      = KeyCR
+	KeyBackspace = KeyBS
+	KeyTab       = KeyTAB
+	KeyEsc       = KeyESC
+	KeyEscape    = KeyESC
+	KeyEnter     = KeyCR
+
+	// NB: This key will be translated to KeyBackspace
 	KeyBackspace2 = KeyDEL
 )
@@ -1,4 +1,4 @@
-// Copyright 2020 The TCell Authors
+// Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use file except in compliance with the License.
@@ -1,4 +1,4 @@
-// Copyright 2024 The TCell Authors
+// Copyright 2025 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use file except in compliance with the License.
@@ -35,17 +35,37 @@ type Screen interface {
 	// is called (or Sync).
 	Fill(rune, Style)

-	// SetCell is an older API, and will be removed.  Please use
-	// SetContent instead; SetCell is implemented in terms of SetContent.
+	// Put writes the first graphme of the given string with th
+	// given style at the given coordinates. (Only the first grapheme
+	// occupying either one or two cells is stored.) It returns the
+	// remainder of the string, and the width displayed.
+	Put(x int, y int, str string, style Style) (string, int)
+
+	// PutStr writes a string starting at the given position, using the
+	// default style. The content is clipped to the screen dimensions.
+	PutStr(x int, y int, str string)
+
+	// PutStrStyled writes a string starting at the given position, using
+	// the given style. The cont4ent is clipped to the screen dimensions.
+	PutStrStyled(x int, y int, str string, style Style)
+
+	// SetCell is an older API, and will be removed.
+	//jj
+	// Deprecated: Please use Put instead.
 	SetCell(x int, y int, style Style, ch ...rune)

-	// GetContent returns the contents at the given location.  If the
+	// Get the contents at the given location.  If the
 	// coordinates are out of range, then the values will be 0, nil,
 	// StyleDefault.  Note that the contents returned are logical contents
 	// and may not actually be what is displayed, but rather are what will
 	// be displayed if Show() or Sync() is called.  The width is the width
 	// in screen cells; most often this will be 1, but some East Asian
 	// characters and emoji require two cells.
+	Get(x, y int) (str string, style Style, width int)
+
+	// GetContent is the old way to get cell contents.
+	//
+	// Deprecated: Use Get() instead.
 	GetContent(x, y int) (primary rune, combining []rune, style Style, width int)

 	// SetContent sets the contents of the given cell location.  If
@@ -221,6 +241,9 @@ type Screen interface {
 	// fallbacks are registered, this will return true.  This will
 	// also return true if the terminal can replace the glyph with
 	// one that is visually indistinguishable from the one requested.
+	//
+	// Deprecated: This is not a particularly useful or reliable function,
+	// due to limitations in fonts, etc.  It will be removed in the future.
 	CanDisplay(r rune, checkFallbacks bool) bool

 	// Resize does nothing, since it's generally not possible to
@@ -228,14 +251,13 @@ type Screen interface {
 	// the View interface.
 	Resize(int, int, int, int)

-	// HasKey returns true if the keyboard is believed to have the
-	// key.  In some cases a keyboard may have keys with this name
-	// but no support for them, while in others a key may be reported
-	// as supported but not actually be usable (such as some emulators
-	// that hijack certain keys).  Its best not to depend to strictly
-	// on this function, but it can be used for hinting when building
-	// menus, displayed hot-keys, etc.  Note that KeyRune (literal
-	// runes) is always true.
+	// HasKey always returns true.
+	//
+	// Deprecated: This function always returns true.  Applications
+	// cannot reliably detect whether a key is supported or not with
+	// modern terminal emulators. (The intended use here was to help
+	// applications determine whether a given key stroke was supported
+	// by the terminal, but it was never reliable.)
 	HasKey(Key) bool

 	// Suspend pauses input and output processing.  It also restores the
@@ -288,10 +310,9 @@ type Screen interface {
 // NewScreen returns a default Screen suitable for the user's terminal
 // environment.
 func NewScreen() (Screen, error) {
-	// Windows is happier if we try for a console screen first.
-	if s, _ := NewConsoleScreen(); s != nil {
+	if s, e := NewTerminfoScreen(); s != nil {
 		return s, nil
-	} else if s, e := NewTerminfoScreen(); s != nil {
+	} else if s, _ := NewConsoleScreen(); s != nil {
 		return s, nil
 	} else {
 		return nil, e
@@ -382,11 +403,37 @@ type baseScreen struct {
 	screenImpl
 }

+func (b *baseScreen) Put(x int, y int, str string, style Style) (remain string, width int) {
+	cells := b.GetCells()
+	b.Lock()
+	defer b.Unlock()
+	return cells.Put(x, y, str, style)
+}
+
+func (b *baseScreen) PutStrStyled(x int, y int, str string, style Style) {
+	cells := b.GetCells()
+	b.Lock()
+	cols, rows := cells.Size()
+	width := 0
+	for str != "" && x < cols && y < rows {
+		str, width = cells.Put(x, y, str, style)
+		if width == 0 {
+			break
+		}
+		x += width
+	}
+	defer b.Unlock()
+}
+
+func (b *baseScreen) PutStr(x, y int, str string) {
+	b.PutStrStyled(x, y, str, StyleDefault)
+}
+
 func (b *baseScreen) SetCell(x int, y int, style Style, ch ...rune) {
 	if len(ch) > 0 {
-		b.SetContent(x, y, ch[0], ch[1:], style)
+		b.Put(x, y, string(ch), style)
 	} else {
-		b.SetContent(x, y, ' ', nil, style)
+		b.Put(x, y, " ", style)
 	}
 }

@@ -401,12 +448,15 @@ func (b *baseScreen) Fill(r rune, style Style) {
 	b.Unlock()
 }

-func (b *baseScreen) SetContent(x, y int, mainc rune, combc []rune, st Style) {
+func (b *baseScreen) SetContent(x, y int, mainc rune, combc []rune, style Style) {
+	b.Put(x, y, string(append([]rune{mainc}, combc...)), style)
+}

+func (b *baseScreen) Get(x, y int) (string, Style, int) {
 	cells := b.GetCells()
 	b.Lock()
-	cells.SetContent(x, y, mainc, combc, st)
-	b.Unlock()
+	defer b.Unlock()
+	return cells.Get(x, y)
 }

 func (b *baseScreen) GetContent(x, y int) (rune, []rune, Style, int) {
@@ -356,11 +356,18 @@ outer:
 		}

 		if b[0] < 0x80 {
-			mod := ModNone
 			// No encodings start with low numbered values
-			if Key(b[0]) >= KeyCtrlA && Key(b[0]) <= KeyCtrlZ {
-				mod = ModCtrl
+			if b[0] > 0 && b[0] < ' ' { // control keys
+				switch Key(b[0]) {
+				case KeyESC, KeyEnter, KeyTAB:
+					s.postEvent(NewEventKey(Key(b[0]), 0, 0))
+					continue;
+				default:
+					s.postEvent(NewEventKey(Key(b[0]), rune(b[0])+'\x60', ModCtrl))
+					continue
+				}
 			}
+			mod := ModNone
 			ev := NewEventKey(Key(b[0]), 0, mod)
 			s.postEvent(ev)
 			b = b[1:]
@@ -8,76 +8,24 @@ func init() {

 	// IBM Aixterm Terminal Emulator
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:         "aixterm",
-		Columns:      80,
-		Lines:        25,
-		Colors:       8,
-		Bell:         "\a",
-		Clear:        "\x1b[H\x1b[J",
-		AttrOff:      "\x1b[0;10m\x1b(B",
-		Underline:    "\x1b[4m",
-		Bold:         "\x1b[1m",
-		Reverse:      "\x1b[7m",
-		SetFg:        "\x1b[3%p1%dm",
-		SetBg:        "\x1b[4%p1%dm",
-		SetFgBg:      "\x1b[3%p1%d;4%p2%dm",
-		ResetFgBg:    "\x1b[32m\x1b[40m",
-		PadChar:      "\x00",
-		AltChars:     "jjkkllmmnnqqttuuvvwwxx",
-		EnterAcs:     "\x1b(0",
-		ExitAcs:      "\x1b(B",
-		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:  "\b",
-		CursorUp1:    "\x1b[A",
-		KeyUp:        "\x1b[A",
-		KeyDown:      "\x1b[B",
-		KeyRight:     "\x1b[C",
-		KeyLeft:      "\x1b[D",
-		KeyInsert:    "\x1b[139q",
-		KeyDelete:    "\x1b[P",
-		KeyBackspace: "\b",
-		KeyHome:      "\x1b[H",
-		KeyEnd:       "\x1b[146q",
-		KeyPgUp:      "\x1b[150q",
-		KeyPgDn:      "\x1b[154q",
-		KeyF1:        "\x1b[001q",
-		KeyF2:        "\x1b[002q",
-		KeyF3:        "\x1b[003q",
-		KeyF4:        "\x1b[004q",
-		KeyF5:        "\x1b[005q",
-		KeyF6:        "\x1b[006q",
-		KeyF7:        "\x1b[007q",
-		KeyF8:        "\x1b[008q",
-		KeyF9:        "\x1b[009q",
-		KeyF10:       "\x1b[010q",
-		KeyF11:       "\x1b[011q",
-		KeyF12:       "\x1b[012q",
-		KeyF13:       "\x1b[013q",
-		KeyF14:       "\x1b[014q",
-		KeyF15:       "\x1b[015q",
-		KeyF16:       "\x1b[016q",
-		KeyF17:       "\x1b[017q",
-		KeyF18:       "\x1b[018q",
-		KeyF19:       "\x1b[019q",
-		KeyF20:       "\x1b[020q",
-		KeyF21:       "\x1b[021q",
-		KeyF22:       "\x1b[022q",
-		KeyF23:       "\x1b[023q",
-		KeyF24:       "\x1b[024q",
-		KeyF25:       "\x1b[025q",
-		KeyF26:       "\x1b[026q",
-		KeyF27:       "\x1b[027q",
-		KeyF28:       "\x1b[028q",
-		KeyF29:       "\x1b[029q",
-		KeyF30:       "\x1b[030q",
-		KeyF31:       "\x1b[031q",
-		KeyF32:       "\x1b[032q",
-		KeyF33:       "\x1b[033q",
-		KeyF34:       "\x1b[034q",
-		KeyF35:       "\x1b[035q",
-		KeyF36:       "\x1b[036q",
-		KeyClear:     "\x1b[144q",
-		KeyBacktab:   "\x1b[Z",
-		AutoMargin:   true,
+		Name:       "aixterm",
+		Columns:    80,
+		Lines:      25,
+		Colors:     8,
+		Clear:      "\x1b[H\x1b[J",
+		AttrOff:    "\x1b[0;10m\x1b(B",
+		Underline:  "\x1b[4m",
+		Bold:       "\x1b[1m",
+		Reverse:    "\x1b[7m",
+		SetFg:      "\x1b[3%p1%dm",
+		SetBg:      "\x1b[4%p1%dm",
+		SetFgBg:    "\x1b[3%p1%d;4%p2%dm",
+		ResetFgBg:  "\x1b[32m\x1b[40m",
+		PadChar:    "\x00",
+		AltChars:   "jjkkllmmnnqqttuuvvwwxx",
+		EnterAcs:   "\x1b(0",
+		ExitAcs:    "\x1b(B",
+		SetCursor:  "\x1b[%i%p1%d;%p2%dH",
+		AutoMargin: true,
 	})
 }
@@ -12,7 +12,6 @@ func init() {
 		Columns:       80,
 		Lines:         24,
 		Colors:        16777216,
-		Bell:          "\a",
 		Clear:         "\x1b[H\x1b[2J",
 		EnterCA:       "\x1b[?1049h\x1b[22;0;0t",
 		ExitCA:        "\x1b[?1049l\x1b[23;0;0t",
@@ -36,33 +35,6 @@ func init() {
 		StrikeThrough: "\x1b[9m",
 		Mouse:         "\x1b[M",
 		SetCursor:     "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:   "\b",
-		CursorUp1:     "\x1b[A",
-		KeyUp:         "\x1bOA",
-		KeyDown:       "\x1bOB",
-		KeyRight:      "\x1bOC",
-		KeyLeft:       "\x1bOD",
-		KeyInsert:     "\x1b[2~",
-		KeyDelete:     "\x1b[3~",
-		KeyBackspace:  "\x7f",
-		KeyHome:       "\x1bOH",
-		KeyEnd:        "\x1bOF",
-		KeyPgUp:       "\x1b[5~",
-		KeyPgDn:       "\x1b[6~",
-		KeyF1:         "\x1bOP",
-		KeyF2:         "\x1bOQ",
-		KeyF3:         "\x1bOR",
-		KeyF4:         "\x1bOS",
-		KeyF5:         "\x1b[15~",
-		KeyF6:         "\x1b[17~",
-		KeyF7:         "\x1b[18~",
-		KeyF8:         "\x1b[19~",
-		KeyF9:         "\x1b[20~",
-		KeyF10:        "\x1b[21~",
-		KeyF11:        "\x1b[23~",
-		KeyF12:        "\x1b[24~",
-		KeyBacktab:    "\x1b[Z",
-		Modifiers:     1,
 		TrueColor:     true,
 		AutoMargin:    true,
 	})
@@ -12,7 +12,6 @@ func init() {
 		Columns:           80,
 		Lines:             24,
 		Colors:            256,
-		Bell:              "\a",
 		Clear:             "\x1b[H\x1b[2J",
 		EnterCA:           "\x1b[?1049h\x1b[22;0;0t",
 		ExitCA:            "\x1b[?1049l\x1b[23;0;0t",
@@ -39,38 +38,7 @@ func init() {
 		StrikeThrough:     "\x1b[9m",
 		Mouse:             "\x1b[<",
 		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1bOH",
-		KeyEnd:            "\x1bOF",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyBacktab:        "\x1b[Z",
-		Modifiers:         1,
 		AutoMargin:        true,
-		DoubleUnderline:   "\x1b[4:2m",
-		CurlyUnderline:    "\x1b[4:3m",
-		DottedUnderline:   "\x1b[4:4m",
-		DashedUnderline:   "\x1b[4:5m",
 		XTermLike:         true,
 	})
 }
@@ -8,36 +8,25 @@ func init() {

 	// ansi/pc-term compatible with color
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:         "ansi",
-		Columns:      80,
-		Lines:        24,
-		Colors:       8,
-		Bell:         "\a",
-		Clear:        "\x1b[H\x1b[J",
-		AttrOff:      "\x1b[0;10m",
-		Underline:    "\x1b[4m",
-		Bold:         "\x1b[1m",
-		Blink:        "\x1b[5m",
-		Reverse:      "\x1b[7m",
-		SetFg:        "\x1b[3%p1%dm",
-		SetBg:        "\x1b[4%p1%dm",
-		SetFgBg:      "\x1b[3%p1%d;4%p2%dm",
-		ResetFgBg:    "\x1b[39;49m",
-		PadChar:      "\x00",
-		AltChars:     "+\x10,\x11-\x18.\x190\xdb`\x04a\xb1f\xf8g\xf1h\xb0j\xd9k\xbfl\xdam\xc0n\xc5o~p\xc4q\xc4r\xc4s_t\xc3u\xb4v\xc1w\xc2x\xb3y\xf3z\xf2{\xe3|\xd8}\x9c~\xfe",
-		EnterAcs:     "\x1b[11m",
-		ExitAcs:      "\x1b[10m",
-		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:  "\x1b[D",
-		CursorUp1:    "\x1b[A",
-		KeyUp:        "\x1b[A",
-		KeyDown:      "\x1b[B",
-		KeyRight:     "\x1b[C",
-		KeyLeft:      "\x1b[D",
-		KeyInsert:    "\x1b[L",
-		KeyBackspace: "\b",
-		KeyHome:      "\x1b[H",
-		KeyBacktab:   "\x1b[Z",
-		AutoMargin:   true,
+		Name:       "ansi",
+		Columns:    80,
+		Lines:      24,
+		Colors:     8,
+		Clear:      "\x1b[H\x1b[J",
+		AttrOff:    "\x1b[0;10m",
+		Underline:  "\x1b[4m",
+		Bold:       "\x1b[1m",
+		Blink:      "\x1b[5m",
+		Reverse:    "\x1b[7m",
+		SetFg:      "\x1b[3%p1%dm",
+		SetBg:      "\x1b[4%p1%dm",
+		SetFgBg:    "\x1b[3%p1%d;4%p2%dm",
+		ResetFgBg:  "\x1b[39;49m",
+		PadChar:    "\x00",
+		AltChars:   "+\x10,\x11-\x18.\x190\xdb`\x04a\xb1f\xf8g\xf1h\xb0j\xd9k\xbfl\xdam\xc0n\xc5o~p\xc4q\xc4r\xc4s_t\xc3u\xb4v\xc1w\xc2x\xb3y\xf3z\xf2{\xe3|\xd8}\x9c~\xfe",
+		EnterAcs:   "\x1b[11m",
+		ExitAcs:    "\x1b[10m",
+		SetCursor:  "\x1b[%i%p1%d;%p2%dH",
+		AutoMargin: true,
 	})
 }
@@ -1,57 +0,0 @@
-// Generated automatically.  DO NOT HAND-EDIT.
-
-package beterm
-
-import "github.com/gdamore/tcell/v2/terminfo"
-
-func init() {
-
-	// BeOS Terminal
-	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:         "beterm",
-		Columns:      80,
-		Lines:        25,
-		Colors:       8,
-		Bell:         "\a",
-		Clear:        "\x1b[H\x1b[J",
-		AttrOff:      "\x1b[0;10m",
-		Underline:    "\x1b[4m",
-		Bold:         "\x1b[1m",
-		Reverse:      "\x1b[7m",
-		EnterKeypad:  "\x1b[?4h",
-		ExitKeypad:   "\x1b[?4l",
-		SetFg:        "\x1b[3%p1%dm",
-		SetBg:        "\x1b[4%p1%dm",
-		SetFgBg:      "\x1b[3%p1%d;4%p2%dm",
-		ResetFgBg:    "\x1b[m",
-		PadChar:      "\x00",
-		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:  "\b",
-		CursorUp1:    "\x1b[A",
-		KeyUp:        "\x1b[A",
-		KeyDown:      "\x1b[B",
-		KeyRight:     "\x1b[C",
-		KeyLeft:      "\x1b[D",
-		KeyInsert:    "\x1b[2~",
-		KeyDelete:    "\x1b[3~",
-		KeyBackspace: "\b",
-		KeyHome:      "\x1b[1~",
-		KeyEnd:       "\x1b[4~",
-		KeyPgUp:      "\x1b[5~",
-		KeyPgDn:      "\x1b[6~",
-		KeyF1:        "\x1b[11~",
-		KeyF2:        "\x1b[12~",
-		KeyF3:        "\x1b[13~",
-		KeyF4:        "\x1b[14~",
-		KeyF5:        "\x1b[15~",
-		KeyF6:        "\x1b[16~",
-		KeyF7:        "\x1b[17~",
-		KeyF8:        "\x1b[18~",
-		KeyF9:        "\x1b[19~",
-		KeyF10:       "\x1b[20~",
-		KeyF11:       "\x1b[21~",
-		KeyF12:       "\x1b[22~",
-		AutoMargin:   true,
-		InsertChar:   "\x1b[@",
-	})
-}
@@ -8,59 +8,25 @@ func init() {

 	// ANSI emulation for Cygwin
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:         "cygwin",
-		Colors:       8,
-		Bell:         "\a",
-		Clear:        "\x1b[H\x1b[J",
-		EnterCA:      "\x1b7\x1b[?47h",
-		ExitCA:       "\x1b[2J\x1b[?47l\x1b8",
-		AttrOff:      "\x1b[0;10m",
-		Underline:    "\x1b[4m",
-		Bold:         "\x1b[1m",
-		Reverse:      "\x1b[7m",
-		SetFg:        "\x1b[3%p1%dm",
-		SetBg:        "\x1b[4%p1%dm",
-		SetFgBg:      "\x1b[3%p1%d;4%p2%dm",
-		ResetFgBg:    "\x1b[39;49m",
-		PadChar:      "\x00",
-		AltChars:     "+\x10,\x11-\x18.\x190\xdb`\x04a\xb1f\xf8g\xf1h\xb0j\xd9k\xbfl\xdam\xc0n\xc5o~p\xc4q\xc4r\xc4s_t\xc3u\xb4v\xc1w\xc2x\xb3y\xf3z\xf2{\xe3|\xd8}\x9c~\xfe",
-		EnterAcs:     "\x1b[11m",
-		ExitAcs:      "\x1b[10m",
-		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:  "\b",
-		CursorUp1:    "\x1b[A",
-		KeyUp:        "\x1b[A",
-		KeyDown:      "\x1b[B",
-		KeyRight:     "\x1b[C",
-		KeyLeft:      "\x1b[D",
-		KeyInsert:    "\x1b[2~",
-		KeyDelete:    "\x1b[3~",
-		KeyBackspace: "\b",
-		KeyHome:      "\x1b[1~",
-		KeyEnd:       "\x1b[4~",
-		KeyPgUp:      "\x1b[5~",
-		KeyPgDn:      "\x1b[6~",
-		KeyF1:        "\x1b[[A",
-		KeyF2:        "\x1b[[B",
-		KeyF3:        "\x1b[[C",
-		KeyF4:        "\x1b[[D",
-		KeyF5:        "\x1b[[E",
-		KeyF6:        "\x1b[17~",
-		KeyF7:        "\x1b[18~",
-		KeyF8:        "\x1b[19~",
-		KeyF9:        "\x1b[20~",
-		KeyF10:       "\x1b[21~",
-		KeyF11:       "\x1b[23~",
-		KeyF12:       "\x1b[24~",
-		KeyF13:       "\x1b[25~",
-		KeyF14:       "\x1b[26~",
-		KeyF15:       "\x1b[28~",
-		KeyF16:       "\x1b[29~",
-		KeyF17:       "\x1b[31~",
-		KeyF18:       "\x1b[32~",
-		KeyF19:       "\x1b[33~",
-		KeyF20:       "\x1b[34~",
-		AutoMargin:   true,
-		InsertChar:   "\x1b[@",
+		Name:       "cygwin",
+		Colors:     8,
+		Clear:      "\x1b[H\x1b[J",
+		EnterCA:    "\x1b7\x1b[?47h",
+		ExitCA:     "\x1b[2J\x1b[?47l\x1b8",
+		AttrOff:    "\x1b[0;10m",
+		Underline:  "\x1b[4m",
+		Bold:       "\x1b[1m",
+		Reverse:    "\x1b[7m",
+		SetFg:      "\x1b[3%p1%dm",
+		SetBg:      "\x1b[4%p1%dm",
+		SetFgBg:    "\x1b[3%p1%d;4%p2%dm",
+		ResetFgBg:  "\x1b[39;49m",
+		PadChar:    "\x00",
+		AltChars:   "+\x10,\x11-\x18.\x190\xdb`\x04a\xb1f\xf8g\xf1h\xb0j\xd9k\xbfl\xdam\xc0n\xc5o~p\xc4q\xc4r\xc4s_t\xc3u\xb4v\xc1w\xc2x\xb3y\xf3z\xf2{\xe3|\xd8}\x9c~\xfe",
+		EnterAcs:   "\x1b[11m",
+		ExitAcs:    "\x1b[10m",
+		SetCursor:  "\x1b[%i%p1%d;%p2%dH",
+		AutoMargin: true,
+		InsertChar: "\x1b[@",
 	})
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stefan Haller	ed4d57c800	Use a color other than yellow or red for commits on a branch that doesn't have an upstream	2026-01-05 21:50:32 +01:00
Stefan Haller	80dd695d7a	Update search position (match x of y) when changing the selection in a list view (#5169 ) When searching (not filtering) in a list view using `/`, moving the selection now updates the "x of y" indicator of the search results to the last one before the selection. Pressing `n` again searches from there rather than from the previously shown result. Also see corresponding gocui PR at https://github.com/jesseduffield/gocui/pull/95.	2026-01-04 18:54:28 +01:00
Stefan Haller	65edd99fd0	Update search position (match x of y) when changing the selection in a list view or in the staging view.	2026-01-04 18:51:45 +01:00
Stefan Haller	98bf8f86d1	Bump gocui and adapt code accordingly	2026-01-04 18:48:47 +01:00
Stefan Haller	a0e81c93b8	Update docs and schema for release (#5168 )	2026-01-03 20:23:27 +01:00
Stefan Haller	7d142df9c2	Update docs and schema for release	2026-01-03 20:20:10 +01:00
Stefan Haller	0bd411111c	Update translations from Crowdin (#5167 )	2026-01-03 20:19:38 +01:00
Stefan Haller	463e81f197	Update translations from Crowdin	2026-01-03 20:15:07 +01:00
Stefan Haller	810f6b22d2	Show an error when checking out a file would overwrite local modifications (#5154 ) Checking out a file discards all local modifications to that file; checking out a directory discards modifications to all files in that directory. This can result in lost work if the user isn't aware of this. Instead of showing a confirmation (to which the user might press enter too hastily, still losing their work), or showing a menu with auto-stash/discard options, we simply show an error. The assumption is that this is an unusual situation that users won't run into often, and if they do, it's easy enough to manually address it by stashing or discarding the changes as appropriate. Fixes #5142.	2026-01-03 20:11:51 +01:00
Stefan Haller	3ccd33b388	Show an error when checking out a file would overwrite local modifications	2026-01-03 20:09:55 +01:00
Stefan Haller	d34266d5e6	Bump gocui (#5166 ) Adds https://github.com/jesseduffield/gocui/pull/93 and https://github.com/jesseduffield/gocui/pull/94.	2026-01-03 14:45:18 +01:00
Stefan Haller	c0b6f4adb9	Bump gocui	2026-01-03 14:39:03 +01:00
Stefan Haller	72fa54d4d5	Add a note about delta's `--navigate` option not working in lazygit (#5155 ) Addresses #5136.	2026-01-01 14:38:24 +01:00
Stefan Haller	f68f027bcc	Add a note about delta's --navigate option not working in lazygit	2026-01-01 14:34:54 +01:00
Stefan Haller	9e455f427c	Fix rendering of certain emojis (#5116 ) This bumps our gocui dependency, which recently learned to render multi-rune grapheme clusters properly. This fixes rendering of a lot of emojis such as ⚡️ or 🏴󠁧󠁢󠁥󠁮󠁧󠁿. Fixes #4854 Fixes #4347 Fixes #3811 Fixes #3711 Fixes #3606 Fixes #3514 Fixes #2702 Fixes #2409	2025-12-23 16:55:47 +01:00
Stefan Haller	bb816d7001	Call gocui's SimpleEditor instead of duplicating its code	2025-12-23 16:49:16 +01:00
Stefan Haller	5423e7459c	Replace go-runewidth with uniseg	2025-12-23 16:49:16 +01:00
Stefan Haller	fec7e9ce61	Bump gocui (and tcell) and adapt lazygit's client code accordingly.	2025-12-23 16:49:16 +01:00
Stefan Haller	32207d25c2	Fix annoying UI stalls after refresh (e.g. background fetch) when the reflog is very long (#5135 ) Draw only the visible lines of the reflogs panel, like we do for commits. Since the reflog can get very long, this saves some memory but especially some UI thread lag. In one of my repos I had over 11'000 reflog entries (I guess I should prune them more regularly...), and rendering them took ~600ms; since this happens on the UI thread, there was an annoying stall for half a second after every background fetch, for example (even if the reflog panel is not visible).	2025-12-23 16:23:00 +01:00
Stefan Haller	84be082fb5	Draw only visible part of the reflogs panel Since the reflog can get very long, this saves some memory but especially some UI thread lag. In one of my repos I had over 11'000 reflog entries (I guess I should prune them more regularly...), and rendering them took ~600ms; since this happens on the UI thread, there was an annoying stall for half a second after every background fetch, for example.	2025-12-23 16:20:32 +01:00
Stefan Haller	f7d4efc59e	Rerender visible lines when scrolling by page This fixes a bug in ListContextTrait.FocusLine whereby the view would go blank when scrolling by page (using ',' or '.') in views that have renderOnlyVisibleLines set to true but refreshViewportOnChange set to false. Currently we don't have any such views; the only ones who use renderOnlyVisibleLines are commits and subcommits, and they also use refreshViewportOnChange. However, we are going to add one in the next commit, and eventually it might be a good idea to convert all our list views to that by default, and get rid of the renderOnlyVisibleLines flag.	2025-12-23 16:20:32 +01:00
Stefan Haller	b4b21f9c65	Fix race condition in HandleRender Move SetContentLineCount into OverwriteLinesAndClearEverythingElse. Calling it separately beforehand is not concurrency safe; we need both to happen when the view's writeMutex is locked.	2025-12-23 16:20:32 +01:00
Stefan Haller	e1a8327583	Avoid scrolling the selection into view on refresh (#5134 ) It is possible to scroll the selection out of view using the mouse wheel; after doing this, it would sometimes scroll into view by itself again, for example when a background fetch occurred. In the files panel this would even happen every 10s with every regular files refresh. Fix this by adding a scrollIntoView parameter to HandleFocus, which is false by default, and is only set to true from controllers that change the selection. Fixes #5097.	2025-12-23 15:37:18 +01:00
Stefan Haller	478d51c83e	When pressing up or down, scroll selection into view if it is outside, even if it didn't change We have this logic to avoid constantly rerendering the main view when hitting up-arrow when you are already at the top of the list. That's good, but we do want to scroll the selection into view if it is outside and you hit up or down, no matter if it changed.	2025-12-23 15:34:38 +01:00
Stefan Haller	efd4298b5e	Avoid scrolling the selection into view on refresh It is possible to scroll the selection out of view using the mouse wheel; after doing this, it would sometimes scroll into view by itself again, for example when a background fetch occurred. In the files panel this would even happen every 10s with every regular files refresh. Fix this by adding a scrollIntoView parameter to HandleFocus, which is false by default, and is only set to true from controllers that change the selection.	2025-12-23 15:34:38 +01:00
Stefan Haller	37bc0dfc44	Extract a method for selecting the first branch (and first commit) We want to do this whenever we switch branches; it wasn't done consistently though. There are many different ways to switch branches, and only some of these would reset the selection of all three panels (branches, commits, and reflog).	2025-12-23 15:08:08 +01:00
Stefan Haller	74b1255b4b	Fix the main view display after reverting a commit (#5138 ) After reverting a commit, the main view would show the diff of a commit that is not the selected one.	2025-12-23 14:59:28 +01:00
Stefan Haller	a415d1b529	Fix the main view display after reverting a commit We move the selection down by the number of commits that were reverted (to keep the same commits selected). However, this only happens after refreshing, which has rendered the main view with the wrong commit, so we need to render it again after moving the selection. There are many other callers of MoveSelection in LocalCommitsController, but all of them happen before the refresh. Revert is special because it needs to move the selection after refreshing, e.g. when reverting the only commit of a branch.	2025-12-23 14:55:58 +01:00
Stefan Haller	0a48f307b1	Add test expectation showing a problem with revert After the revert, the main view shows the diff of the wrong commit.	2025-12-23 14:48:58 +01:00
Stefan Haller	cf873b16d9	Prevent many hyperlinks from launching while mouse moving (#5133 ) Update our gocui dependency, which brings in the fix that was made there; see https://github.com/jesseduffield/gocui/pull/86. (Fix by `Chris McDonnell <c.a.mcdonn@gmail.com>`)	2025-12-22 16:28:42 +01:00
Stefan HallerandChris McDonnell	2189c3b43a	Bump gocui This brings in the fix "Prevent many hyperlinks from launching while mouse moving". Co-authored-by: Chris McDonnell <c.a.mcdonn@gmail.com>	2025-12-22 16:22:36 +01:00
Stefan Haller	e7b69bcf24	Support custom keybindings in custom command menu prompts (#5129 ) ## Summary resolves: #3626 This adds support for keybindings on menu options. ### Example Usage: ```yml customCommands: - key: 'e' context: 'files' command: 'echo {{.Form.Choice \| quote}} > result.txt' prompts: - type: 'menu' title: 'Choose an option' key: 'Choice' options: - value: 'foo' description: 'FOO' key: 'f' - value: 'bar' description: 'BAR' key: 'b' ``` ### Please check if the PR fulfills these requirements * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [x] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [x] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [x] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [x] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc	2025-12-22 14:24:29 +01:00
Karl Wikström	62913ee25d	feat: support custom keybinds in custom command prompt menus	2025-12-22 13:43:52 +01:00
Stefan Haller	262e7f4e79	Change keybinding of "keep" item in Merge Conflict menu back to 'k' (#5132 ) Now that we can use 'k' as a menu item binding (this was fixed in #5131), use it for the "keep" entry in the merge menu. I don't think this will be a problem for people's muscle memory, given that this menu is not encountered every day; and it's simply the better keybinding. This reverts commit `b32b55201e`.	2025-12-22 09:51:26 +01:00
Stefan Haller	6043eb52db	Revert "Update resolve conflict using p instead of k" Now that we can use 'k' as a menu item binding (this was fixed in #5131), use it for the "keep" entry in the merge menu. I don't think this will be a problem for people's muscle memory, given that this menu is not encountered every day; and it's simply the better keybinding. This reverts commit `b32b55201e`.	2025-12-22 09:49:04 +01:00
Stefan Haller	70fe7bd1b4	Allow using 'j', 'k', 'H', or 'L' as keybindings in custom command menus (#5131 ) Previously they would be shown as keybindings in the menu, but they didn't work because their builtin functionality (select next/prev line, scroll view left/right) would take precedence. This will allow us to revert #4934; doing that in a separate PR, see #5132.	2025-12-22 09:48:38 +01:00
Stefan Haller	344d3866a6	Make menu keybindings take precedence over builtin ones, except for confirm/esc This makes it possible to use 'j', 'k', 'H' or 'L' as menu item keybindings.	2025-12-22 09:37:06 +01:00
Stefan Haller	f996e47199	Rename KeepConfirmKeybindings to KeepConflictingKeybindings After the change in the previous commit this expresses better what it is about.	2025-12-22 09:37:06 +01:00
Stefan Haller	7e3b24d496	In menus, remove not just the confirm binding, but also esc and up/down This is not really super important because we are very unlikely to assign a key such as esc or up/down to a menu item. However, users might do this in a custom commands menu, and in that case it is important that the builtin keys still work; or they might remap those builtin commands to other keys, in which case they might conflict with single-letter keys in normal menus.	2025-12-22 09:37:06 +01:00
Stefan Haller	e19544a42b	Add a test that demonstrates problems with custom menu keybindings The test shows two problems: a <down> keybinding is not removed from a menu item (the 'y' binding is removed though, which is correct), and keybindings such as 'j' and 'H' don't work. We will fix both of these separately in the following commits.	2025-12-22 09:37:06 +01:00
Stefan Haller	b7a24c8298	feat: add Codeberg as a supported git hosting service (#5130 ) Thank you for an awesome tool. I wanted to add support for codeberg. Tested locally that opening pull-request works ### PR Description Codeberg is a Gitea-based git hosting service that uses the same URL patterns for pull requests and commits but differs on its hostname	2025-12-21 14:13:20 +01:00
Yadi Abdalhalim	24e9197be2	feat: add Codeberg as a supported git hosting service Codeberg is a Gitea-based git hosting service that uses the same URL patterns for pull requests and commits. This adds native support so users don't need to manually configure it.	2025-12-21 14:10:59 +01:00
Stefan Haller	3201695658	feat: add keys for command log menu items (#5096 )	2025-12-14 17:14:50 +01:00
Peter Cardenas	a41bd6a255	feat: add keys for command log menu items	2025-12-14 17:12:47 +01:00
Stefan Haller	8651c46e14	Fix small issues with the Breaking Changes texts (#5114 )	2025-12-11 21:13:30 +01:00
Stefan Haller	46c095cc29	Add a missing quote	2025-12-11 21:10:11 +01:00
Stefan Haller	9aa268c1f4	Cleanup: use spaces instead of tab	2025-12-11 21:09:57 +01:00
Stefan Haller	6600adf671	Remove confirmation for opening the merge tool (#5094 ) The confirmation used to make sense back when the Open MergeTool command was its own top-level command; however, that command was changed in #4889 to open a menu instead, and Open MergeTool is now just a submenu entry in that menu, so it no longer needs a confirmation. Fixes #5093.	2025-12-08 09:48:58 +01:00
Stefan Haller	f6cba966d0	Remove confirmation for opening the merge tool The confirmation used to make sense back when the Open MergeTool command was its own top-level command; however, that command was changed in `703f053a7e` to open a menu instead, and Open MergeTool is now just a submenu entry in that menu, so it no longer needs a confirmation.	2025-12-07 20:55:25 +01:00