Skip to content

chore: sync upstream/master into fork master - #10

Merged
geril07 merged 17 commits into
masterfrom
sync/upstream-master
Sep 13, 2026
Merged

chore: sync upstream/master into fork master#10
geril07 merged 17 commits into
masterfrom
sync/upstream-master

Conversation

@geril07

@geril07 geril07 commented Sep 13, 2026

Copy link
Copy Markdown
Owner

Sync upstream herdrdev/herdr master (bafbc09) into fork master.

  • Base: geril07/herdr master at fa9e36f (9 fork commits ahead of b11ac85)
  • Head: sync/upstream-master, merge of upstream/master bafbc09
  • Contains 16 upstream commits since b11ac85, merged clean with no conflicts.
  • Merge with a merge commit to preserve fork history.

Upstream range fork/master..upstream/master:
bafbc09 fix(linux): avoid blocking proc reads for wsl agents (herdrdev#2179)
3b9f58b fix: deflake windows endpoint flush drain test (herdrdev#4021)
aa6b531 fix: update grok session after new (herdrdev#2683)
98a8c6c fix: restore alternate-screen pane width (herdrdev#4016)
5eafc61 fix: honor space row gaps across machines (herdrdev#3740)
e3a46f4 fix: recognize codex composer sparkles (herdrdev#4015)
96f2324 fix: allow retrying partial worktree removal (herdrdev#3315)
d184b41 fix: batch queued endpoint input frames (herdrdev#4004)
c17dc3f fix: keep windows endpoint writes progressing (herdrdev#3721)
6cf4bbb fix: finish windows ssh setup after bridge exit (herdrdev#3719)
a5d5f6f fix: ignore nested OMP session reports (herdrdev#3994)
cc36a29 fix: preserve complete alternate-screen history reads (herdrdev#3979)
9ad65d9 fix: suppress Windows dead-key fallback characters in remote panes (herdrdev#3972)
fb5525f fix: opencode v2 lifecycle reporting (herdrdev#3757)
38d002d docs: enable nesting in throwaway repro setup
a0474ae fix: preserve whole-word selection while dragging (herdrdev#3969)

ogulcancelik and others added 17 commits September 11, 2026 22:58
* fix: support opencode v2 lifecycle reporting

* fix: repair Japanese docs

* fix: ignore payload-less OpenCode events

* fix: harden opencode v2 integration install and reporting

Follow-ups on top of the V2 lifecycle support:

- create `cli.json` when OpenCode has no V1 TUI preferences (`tui.json` or
  `kv.json`) to migrate, instead of only registering into an existing file
- settle stalled socket attempts with a plain connect timer, and resend the
  latest lifecycle state after a failed delivery so the pane cannot get stuck
- resolve the OpenCode state directory from `XDG_STATE_HOME`
- remove the managed `herdr-opencode` directory on uninstall
- document failed executions reporting `blocked`, keep the integration test
  environment independent of an inherited `XDG_STATE_HOME`, and simplify
  `reconcileBlockers` to reassign its map

---------

Co-authored-by: Jonathan Liebig <jonathan.liebig@gmail.com>
…erdrdev#3972)

refs herdrdev#3948

Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com>
refs herdrdev#3833

Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com>
refs herdrdev#3314

Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com>
* fix: honor space row gaps across machines

refs herdrdev#3738

* test: cover scrolling with machine space gaps

refs herdrdev#3738

---------

Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com>
* fix: update grok session after new

refs herdrdev#2681

* fix: avoid powershell args shadowing

refs herdrdev#2681

---------

Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com>
The polling peer drains at production's 2ms Windows read cadence, so a 1 MiB
frame took ~5.5s locally and exceeded the test's 10s flush deadline under CI
load. Use a 256 KiB frame, still well above the 64 KiB batch limit, and a 30s
deadline so the assertion no longer depends on CI scheduling.
Co-authored-by: JJ Liebig <jonathan.liebig@gmail.com>
@geril07 geril07 changed the title chore: sync upstream master into fork master chore: sync upstream/master into fork master Sep 13, 2026
@geril07
geril07 merged commit f461a61 into master Sep 13, 2026
7 checks passed
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