feat(herdr): thorough rebase onto upstream 94f6d9c0 + fork features - #6
Merged
Conversation
* feat: add opt-in client-rendered shell * feat: add client-owned shell mouse controls * feat: complete client-owned shell chrome * feat: add client-owned shell settings and notifications * feat: run client shell custom commands * feat: render popup terminals in client shell * feat: add client-owned scrollback and copy mode * fix: preserve client worktree trust defaults * feat: render startup diagnostics in client shell * feat: render onboarding in client shell * feat: render product announcements in client shell * feat: render release notes in client shell * feat: render mobile switcher in client shell * feat: render kitty graphics in client shell * fix: preserve client shell lifecycle coherence * refactor: route client shell commands through endpoint connections * refactor: make the client-rendered shell the default * refactor: remove monolithic launch mode * refactor: complete client-rendered shell cutover * perf: retain client pane surface updates * perf: scale retained pane surface updates * perf: remove remote pane input latency * test: make client shell checks platform-independent * fix: prevent client timer starvation * test: fix client shell platform gates * test: accept retained surfaces in cross-area checks * test: make client mode assertions platform-neutral * fix: badge only outdated integrations
…dev#3502) * fix(windows): parse openssh mouse reports with physical escape * fix(windows): require sgr mouse prefix * fix(windows): preserve escape ordering and modifiers
* fix(windows): reject malformed process environments refs herdrdev#3430 * fix(windows): validate registry environment strings refs herdrdev#3430 * fix(windows): preserve hidden environment variables refs herdrdev#3430
build.rs now reports how to install Zig 0.15.2 (brew install zig@0.15 on macOS, ziglang.org elsewhere) and mentions the ZIG environment variable instead of panicking with a bare NotFound error. Co-authored-by: JJ Liebig <jonathan.liebig@gmail.com>
refs herdrdev#3209 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com>
* feat: add stable client endpoint compatibility * fix: keep portable-pty patch checks composable * ci: run maintenance checks in pull requests * fix: reject endpoint errors from terminal clients * feat: keep compatible servers running across updates
* fix(windows): remove worktrees with active agent panes * fix(windows): defer pane restore until shutdown exits
refs herdrdev#3444 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com>
…3548) refs herdrdev#3546 Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> Co-authored-by: JJ Liebig <jonathan.liebig@gmail.com>
first wave of thorough rebase per REBASE_INVENTORY.md 2.1+3.1: locales+i18n infra, standalone scripts, fork docs/skills, openspec, new workflows. detect/qwen and integration already superseded upstream, left untouched.
Second wave per REBASE_INVENTORY.md 2.2+3.2: grok background-work rule published to distribution, CopyOnSelect manual tri-state with client/shell adaptation, autodetect Windows retry, build/cargo/just wiring, conflict-free qwen docs. Skips recorded in body. - distribution/agent-detection/grok.toml: publish bundled background_work_chip_working rule (v.2/min_engine 3); drop staged exception + fix mutated-manifest test expectation - src/config/model.rs + config.rs + main.rs + client/shell/*: CopyOnSelectModeConfig (clipboard/manual/disabled, bool compat), default manual; shell: manual copy key, clipboard automouse-up - src/selection.rs: manual-mode doc only (keep upstream generic) - src/server/autodetect.rs: Windows status retry helper only (keep upstream TerminalHello/endpoint-generation) - build.rs/Cargo.toml/justfile: locales rerun+include, Zig cache, SystemInformation, maintenance-test new modules - docs 12 conflict-free mdx (agents/integrations/keyboard/ quick-start x en/ja/zh-cn); Hermes version corrected to 5 - skipped: qwen.toml (upstream newer), index (already lists qwen), agent_resume (upstream has qwen; fork hunks are duplicates), schema/workspace/tab/restore/snapshot (pane-transfer hard), cli/spec + update full i18n (no-session removal conflict), conflicting docs/schema.json/CHANGELOG, AGENTS local section, workflow fork hacks, sound.rs ordering noise
…nd origin fields port fork pane-move hard parts without new endpoint method: - PaneState origin_workspace_id/label for cross-workspace transfer - Workspace reversible take/restore token, Tab restore helper - TileLayout/Node Clone for move path only, caller uses restore token
replace hardcoded English in client/shell settings_overlay with t keys, add ClientSettingsSection display_label using state.* keys, keep label for compat, default zh already in config
add ReadOutcome tri-state, batch up to 64 reads per wake in run loop, fix handoff drain sites, update test assert
capture origin_workspace fields in snapshot, restore into PaneState, inherit origin on tab split and test split, keep selection and autodetect untouched to preserve upstream endpoint behavior
refs #thorough-rebase
refs #thorough-rebase
refs #thorough-rebase
refs #thorough-rebase
fork 默认 copy_on_select=Manual,自动复制链路测试需显式切 Clipboard,否则选区不会自动清理/复制
用户亲口确认：新线直接顶掉老main，老main不要了。 用 -s ours 保留新线全部内容，只记录历史不断线，61个冲突文件全部按新线为准。
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
5 participants
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.
底座 upstream/master 94f6d9c，只读官方未推送。8提交：清单+第1波+第2波+第3波（窗格转移/汉化重接/pty批量/origin持久）+fmt。cargo check过，fmt过。