Repository navigation
chore(upstream): merge herdr v0.9.5 - #17
Merged
Merged
Conversation
refs #4725 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> Co-authored-by: JJ Liebig <jonathan.liebig@gmail.com>
refs #4749 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> Co-authored-by: JJ Liebig <jonathan.liebig@gmail.com>
* fix: keep escape-prefixed terminal key bindings intact refs #4751 * test: cover escape-prefixed option+backspace binding refs #4751
refs #4507
* fix: avoid per-cell allocations in terminal text reads refs #4506 * fix: preserve tight allocations for owned grapheme reads refs #4506 --------- Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> Co-authored-by: JJ Liebig <jonathan.liebig@gmail.com>
* fix: stop hidden panes keeping a full-size screen copy from creation * fix: start new panes at their laid-out size refs #4419
* test: isolate integration subprocesses from pane env refs #4928 * test: cover pane env isolation for spawned servers refs #4928 --------- Co-authored-by: kataokatsuki <kataokatsuki@users.noreply.github.com>
refs #4910 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> Co-authored-by: JJ Liebig <jonathan.liebig@gmail.com>
* fix: deliver quick esc taps on macos with kitty keyboard refs #1266 * test: cover esc splitting edge cases under the macos input policy refs #1266
* fix: stop waiting forever for an unfinished host color reply refs #5052 * fix: keep input that follows an unfinished host color reply refs #5052 * fix: drop an unfinished host color reply after an idle timeout refs #5052
* fix: map non-latin layout ctrl chords to their base keys refs #1079 * fix: keep us shifted symbols for non-latin punctuation chords * fix: limit base-key chords to non-latin scripts and skip altgr-like ctrl+alt * fix: recover shifted key alternates from vt bytes on windows input * fix: cover cherokee, syllabics, mongolian and nearby scripts in base-key chords * fix: cover lowercase cherokee supplement in base-key chords * fix: only reparse windows vt keys that carry a shifted kitty alternate * fix: match ghostty for layout ctrl chords and drop extra rewrites * fix: keep shift-implied layout ctrl chords on the layout key * fix: pair layout chord releases when modifiers change first * fix: lease layout ctrl chords by their reported key
* fix: open goto search on shifted slash in report-all panes refs #4963 * fix: use the typed character for overlay slash and text shortcuts refs #4963 * fix: require typed evidence for a shifted slash in goto refs #4963
* fix: reduce interactive pane echo latency refs #4884 * fix: preserve accepted input priority and skip unchanged cursor writes refs #4884
* fix: restore keyboard protocol flags after a terminal reconnect refs #4985 * test: cover keyboard protocol refresh with an outer kitty mode refs #4985
* fix: save sessions before agents die during macos restart refs #4414 * fix: keep macos shutdown detection ordered across handoff refs #4414 * fix: avoid aliasing the macos notify block refs #4414 * test: make macos shutdown ordering tests deterministic refs #4414
refs #4950 Co-authored-by: Can Celik <ogulcancelik@gmail.com>
* fix: keep sgr pixel mouse units consistent refs #3675 * fix: keep starting when the host leaves pixel mouse mode set refs #3675 --------- Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> Co-authored-by: Ogulcan Celik <ogulcancelik@gmail.com>
refs #5255 (cherry picked from commit f53f92dd40d5c21b36b4cca209cffeb91b69cd0e)
refs #4507 (cherry picked from commit 287da8072ff8363f406f5d8c4e52fd3227eea58e)
refs #4573 (cherry picked from commit 9c38bbc64e3b7a23176afb2451a067a53fb8d2fd)
portable-pty's Windows search_path accepted any existing candidate, so a directory on PATH whose name matched the program shadowed the real executable and CreateProcessW failed with os error 5. Require a regular file for both the exact name and the PATHEXT candidates. refs #5267 (cherry picked from commit 576dd3670dedbfe64463851a4da065bf66f4fa5d)
Every bundled Windows PowerShell hook read its hook JSON with `[Console]::In.ReadToEnd()`, which decodes stdin using the process console input code page instead of UTF-8. On Korean Windows (CP949) that corrupts the payload, `ConvertFrom-Json` throws, and the hook silently exits without reporting the session. Read the raw stdin stream as UTF-8 (BOM-aware) in every PowerShell hook and bump the affected integration versions. refs #5253 (cherry picked from commit 00584a279427fb6c1af418c8cb4588376d7df089)
PowerShell serializes progress records such as module auto-loading's "Preparing modules for first use." to the stderr CLIXML stream when stderr is redirected under `-EncodedCommand`, and Herdr forwards that stderr during interactive remote setup. Set `$ProgressPreference = 'SilentlyContinue'` in the shared Windows PowerShell preamble so `machine add` and `--remote` no longer print raw CLIXML records. refs #4639 (cherry picked from commit 8a20d0b7b5fbce8559c6fb916c506176014d3a82)
…-sync/v0.9.5 # Conflicts: # .github/workflows/ci.yml # .github/workflows/preview.yml # .github/workflows/release.yml # AGENTS.md # CHANGELOG.md # Cargo.lock # Cargo.toml # README.md # README.zh-CN.md # docs/next/CHANGELOG.md # docs/next/README.md # docs/next/README.zh-CN.md # docs/next/website/src/content/docs/add-herdr-support.mdx # docs/next/website/src/content/docs/agents.mdx # docs/next/website/src/content/docs/cli-reference.mdx # docs/next/website/src/content/docs/configuration.mdx # docs/next/website/src/content/docs/integrations.mdx # docs/next/website/src/content/docs/ja/add-herdr-support.mdx # docs/next/website/src/content/docs/ja/agent-automation.mdx # docs/next/website/src/content/docs/ja/agents.mdx # docs/next/website/src/content/docs/ja/cli-reference.mdx # docs/next/website/src/content/docs/ja/configuration.mdx # docs/next/website/src/content/docs/ja/connecting-machines.mdx # docs/next/website/src/content/docs/ja/install.mdx # docs/next/website/src/content/docs/ja/integrations.mdx # docs/next/website/src/content/docs/ja/keyboard.mdx # docs/next/website/src/content/docs/ja/persistence-remote.mdx # docs/next/website/src/content/docs/ja/plugins.mdx # docs/next/website/src/content/docs/ja/quick-start.mdx # docs/next/website/src/content/docs/ja/socket-api.mdx # docs/next/website/src/content/docs/ja/windows-beta.mdx # docs/next/website/src/content/docs/keyboard.mdx # docs/next/website/src/content/docs/persistence-remote.mdx # docs/next/website/src/content/docs/plugins.mdx # docs/next/website/src/content/docs/quick-start.mdx # docs/next/website/src/content/docs/socket-api.mdx # docs/next/website/src/content/docs/windows-beta.mdx # docs/next/website/src/content/docs/zh-cn/add-herdr-support.mdx # docs/next/website/src/content/docs/zh-cn/agent-automation.mdx # docs/next/website/src/content/docs/zh-cn/agents.mdx # docs/next/website/src/content/docs/zh-cn/cli-reference.mdx # docs/next/website/src/content/docs/zh-cn/configuration.mdx # docs/next/website/src/content/docs/zh-cn/connecting-machines.mdx # docs/next/website/src/content/docs/zh-cn/install.mdx # docs/next/website/src/content/docs/zh-cn/integrations.mdx # docs/next/website/src/content/docs/zh-cn/keyboard.mdx # docs/next/website/src/content/docs/zh-cn/persistence-remote.mdx # docs/next/website/src/content/docs/zh-cn/plugins.mdx # docs/next/website/src/content/docs/zh-cn/quick-start.mdx # docs/next/website/src/content/docs/zh-cn/socket-api.mdx # docs/next/website/src/content/docs/zh-cn/windows-beta.mdx # docs/next/website/src/data/config-reference.json # docs/preview/website/src/content/docs/add-herdr-support.mdx # docs/preview/website/src/content/docs/agents.mdx # docs/preview/website/src/content/docs/configuration.mdx # docs/preview/website/src/content/docs/install.mdx # docs/preview/website/src/content/docs/integrations.mdx # docs/preview/website/src/content/docs/ja/add-herdr-support.mdx # docs/preview/website/src/content/docs/ja/agent-automation.mdx # docs/preview/website/src/content/docs/ja/agents.mdx # docs/preview/website/src/content/docs/ja/cli-reference.mdx # docs/preview/website/src/content/docs/ja/configuration.mdx # docs/preview/website/src/content/docs/ja/connecting-machines.mdx # docs/preview/website/src/content/docs/ja/install.mdx # docs/preview/website/src/content/docs/ja/integrations.mdx # docs/preview/website/src/content/docs/ja/socket-api.mdx # docs/preview/website/src/content/docs/socket-api.mdx # docs/preview/website/src/content/docs/zh-cn/add-herdr-support.mdx # docs/preview/website/src/content/docs/zh-cn/agent-automation.mdx # docs/preview/website/src/content/docs/zh-cn/agents.mdx # docs/preview/website/src/content/docs/zh-cn/cli-reference.mdx # docs/preview/website/src/content/docs/zh-cn/configuration.mdx # docs/preview/website/src/content/docs/zh-cn/connecting-machines.mdx # docs/preview/website/src/content/docs/zh-cn/install.mdx # docs/preview/website/src/content/docs/zh-cn/integrations.mdx # docs/preview/website/src/content/docs/zh-cn/socket-api.mdx # docs/versions/README.md # docs/versions/manifest.json # scripts/windows_cross.py # src/client/input.rs # src/client/shell/context_menu.rs # src/client/shell/mouse.rs # src/client/shell/sidebar.rs # src/client/shell_runtime.rs # src/raw_input.rs # src/server/headless.rs # src/server/mod.rs
|
Important Review skippedToo many files! This PR contains 225 files, which is 125 over the limit of 100. To get a review, reduce the PR to 100 files or fewer by splitting it into smaller PRs or changing its base branch. Upgrade to a paid plan to raise the limit. This review couldn't start because sufficient usage credits or metered capacity aren't available. Add credits or update usage-based reviews in the billing tab, then retry. ⚙️ Run configuration
⛔ Files ignored due to path filters: 1
📒 Files selected for processing: 225
You can disable this status message by setting the
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merges Herdr v0.9.5 (which includes v0.9.4) into Superherdr, ahead of the
superherdr-v0.9.5.1release. Built withscripts/sync_upstream.sh v0.9.5 --report, conflicts resolved by hand.Conflict resolutions
Cargo.toml/Cargo.lock: keptsuperherdrpackage identity, took upstream's dependency changes (newwindowsdep), version bumped to Herdr base0.9.5;cargo update -p superherdr --offlineclean.src/client/shell/sidebar.rs: upstream's #4772 worktree-group fix (strict parent/child: all non-linked members are parents, children are linked worktrees only) merged with Focus/Snooze visibility filtering; hidden repository parents still promote their visible linked children flat.src/client/shell/context_menu.rs: upstream'sclose_groupplumbing (conditional Close/Close group label,request_workspace_close,workspace_close_is_group) merged into Superherdr's unified snooze/focus menu arm.src/client/shell_runtime.rs: Superherdr's inactive-endpoint shared-snooze queueing kept; upstream's pre-fenceWorkspaceFocusallowance folded into the same filter.src/client/input.rs,src/raw_input.rs: took upstream wholesale (fork never modified these files; conflicts were inherited-v0.9.3 content vs upstream's v0.9.5 input rework).src/server/{mod,headless}.rs: kept both module lines (oursnooze_store, upstream's newshutdown).src/client/shell/mouse.rs: kept our focus/snooze hit handlers (upstream changed nothing in the hunk).Excluded paths dropped per
.upstream-sync/exclude; upstream edits to Superherdr-owned files reviewed — onlyCHANGELOG.mdneeded porting (inherited 0.9.4/0.9.5 sections); CI action bumps are covered by the open dependabot PRs; upstream's Windows-only justfile recipes and docs-versioning prose don't apply to the fork.Release chores in this PR
0.9.5+SUPERHERDR_REVISION = 1→superherdr 0.9.5.1.CHANGELOG.md: new0.9.5.1section (fork-relevant curation) plus inherited 0.9.4 and 0.9.5 bodies ported from upstream's changelog.src/client/shell/tests/startup_overlays.rs: the release-notes modal title pin updatedv0.9.3.1→v0.9.5.1(title renders the compiled version; required on every base bump).Verification
On hotrod (Linux x86_64), Zig 0.16.0 installed via mise (CONTRIBUTING prerequisite that was missing on this machine):
cargo fmt --check— cleancargo clippy --all-targets --locked -- -D warnings— cleancargo nextest run --locked(full suite) — 4183 run: 4182 passed + 1 version-pin test fixed in this PR, then green; 16 skippedpython3 -m unittestmaintenance suites (agent-detection manifest, hermes asset, conpty packaging, sync-upstream, unix installer, vendored libghostty-vt, portable-pty, windows input) — 97 tests OKpython3 -m unittest scripts.test_ui_hot_path_architecture— OKbun test src/integration/assets/...— 55 pass, 0 failbunx @fission-ai/openspec validate --all --strict— 6 passed, 0 failedscripts/sync_upstream.sh --check— exclusions okMerge with Create a merge commit so upstream ancestry is preserved for the next sync.