Skip to content

Omarchy Package - #4

Draft
dhh wants to merge 14 commits into
masterfrom
omarchy
Draft

Omarchy Package#4
dhh wants to merge 14 commits into
masterfrom
omarchy

Conversation

@dhh

@dhh dhh commented Aug 10, 2026

Copy link
Copy Markdown
Collaborator

Holding PR for all the patches that are in the Omarchy herdr package but not yet upstreamed.

kataokatsuki and others added 6 commits August 10, 2026 14:34
* fix(ui): anchor the host cursor to modal name inputs

IMEs draw their composition preview at the host terminal cursor. The rename
and new-worktree dialogs drew a block glyph instead of setting one, so the
frame carried no cursor and the client kept the position the focused pane
last reported. Japanese composition appeared behind the dialog and only
reached the field on Enter.

Set the cursor to the caret column instead, counting wide characters as two
cells.

refs herdrdev#1755

* fix(ui): keep the clamped caret cell blank

A name that fills the field left the clamped caret sitting on the last
rendered glyph. A terminal inverts the cell under its cursor and an IME
composes there, so the glyph was hidden and composition overlapped it.

Render the text one column short of the field. The field is still cleared
in full, so the clamped caret always lands on a blank cell.

refs herdrdev#1755

---------

Co-authored-by: kataokatsuki <kataokatsuki@users.noreply.github.com>
Co-authored-by: Can Celik <ogulcancelik@gmail.com>
refs herdrdev#2450

Co-authored-by: Ogulcan Celik <ogulcancelik@gmail.com>
atomsbaza and others added 8 commits August 10, 2026 23:02
…v#2377)

The Char('j')/Char('k')/Down/Up match arms in handle_navigator_key
had no modifier guard, unlike every sibling arm in the same match
block, so Ctrl+K, Alt+J, etc. also moved the navigator selection.

refs herdrdev#1981

Co-authored-by: Can Celik <ogulcancelik@gmail.com>
…erdrdev#2627)

* feat: keep the outer terminal window title in sync with the session

Herdr emulates the terminals in its panes, so an OSC 0/OSC 2 title
written inside a pane stops at Herdr and never reaches the terminal
Herdr itself runs in. That outer title is what window managers read for
title bars, tab bars, and group bars, so it kept showing whatever the
shell or ssh happened to leave behind.

Add `ui.window_title`, rendered from {hostname}, {workspace}, {tab},
{pane}, and {terminal_title}, and push it to the foreground client
whenever it changes. It renders on the server, so {hostname} names the
machine the panes actually run on rather than the machine a thin remote
client runs on, and it is gated on a pending render so an idle loop
never pays for it.

A title is only remembered as delivered once a foreground client takes
it, so the first client to attach is written to rather than skipped.
`client.window_title.set` still wins over the configured title, and
clearing it now hands the title back to `ui.window_title` instead of
only "herdr".

* fix: deliver the outer window title to a newly attached client

ClientConnected assigns the foreground client directly rather than going
through promote_client_to_foreground, so clearing the sent-title cache
there missed the case that matters most: attaching a second terminal to a
running session. The title was usually unchanged, so the sync returned
early and the new terminal kept whatever its shell or ssh had left.

Key the cache on the client that received the title instead of relying on
every foreground assignment to invalidate it.

* perf: keep hidden pane output off the window title path

Output from a hidden or background pane sets needs_render without setting
needs_full_render, and the retained render plan then skips presentation
for it entirely. Syncing the title on needs_render meant every coalesced
hidden-output tick still formatted, sanitized, and allocated a title that
could not have changed, against the hidden-source early exit AGENTS.md
requires.

Every input to the title is app state, which always requests a full
render, so gate on that instead. The one exception is the focused pane's
own terminal title, which arrives through PTY parsing, so ask for a full
render when that changes and the configured title uses it.

* fix: only cache a window title a client writer received

* fix: carry an api set window title across a live handoff

* fix: make outer window title updates event-driven

---------

Co-authored-by: Ogulcan Celik <ogulcancelik@gmail.com>
* fix: wait for agent prompt readiness

refs herdrdev#2410

* fix: return pane updates after tab bar command

refs herdrdev#2410

---------

Co-authored-by: Can Celik <ogulcancelik@gmail.com>
Native agent session restore rebuilt the resume command from the session
reference alone, so a pane started as `claude --permission-mode
bypassPermissions` came back with default permissions.

Capture the options the agent process was started with during foreground
process detection, persist them per agent in the session snapshot, and
replay them after the session reference on resume.

Two rules decide what survives. Options that select a conversation or a
one-shot run are dropped per agent, and a bare word is kept only when it
directly follows a kept option, where it is that option's value. The
second rule is what makes the first cheap: the value of a dropped option
disappears because it follows no kept option, so `--resume <id>` loses the
id without Herdr knowing that `--resume` takes one, and a subcommand form
such as `codex resume <id>` needs no special case. Everything else is
replayed, including options Herdr does not know about.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants