Skip to content

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

Merged
geril07 merged 6 commits into
masterfrom
sync/upstream-master
Oct 30, 2026
Merged

geril07 merged 6 commits into
masterfrom
sync/upstream-master

Conversation

@geril07

@geril07 geril07 commented Oct 30, 2026

Copy link
Copy Markdown
Owner

Syncs upstream/master (ee5bfb50) into the fork. 5 upstream commits since the last sync (5608de06 / 6cc62126):

Merge report

  • Conflicts: none. git merge --no-ff upstream/master merged cleanly; no manual resolutions were needed.
  • Semantic checks of the overlapping files:
    • src/platform/linux.rs — upstream moved the bounded clipboard helper machinery into a new src/platform/linux/clipboard.rs; the public clipboard functions stay in linux.rs and the fork's foreground_process_observation / process_group_children probe is untouched.
    • src/remote/attach.rs — the new ready marker coexists with the fork's own custom-v* update manifests (distribution/fork-latest.json, distribution/fork-preview.json).
    • .github/workflows/stale-close.yml — guarded by if: github.repository == 'herdrdev/herdr', so it does not run in this fork.
    • Clipboard copy toast behavior from 3b259e25 still passes its test.
  • No decisions needed: nothing in this batch changes fork-visible architecture or touches fork-specific surfaces (fork manifests, sidebar search, process labels, layout-independent shortcuts).

Verified: just check — 4307 tests, fmt, clippy, Windows lint, docs contract.

ogulcancelik and others added 6 commits October 27, 2026 00:26
…ze herdr (herdrdev#5583)

* fix: bound clipboard helpers so a hung wl-copy or wl-paste can't freeze herdr

refs herdrdev#5515

* fix: keep copy feedback for repeated copies and tolerate zombie helpers in tests

refs herdrdev#5515
…rdrdev#5585)

* fix: install opencode and kilo integrations under XDG_CONFIG_HOME

refs herdrdev#5375

* fix: use opencode_config_dir literally like opencode does

refs herdrdev#5375
Upstream ee5bfb5, 5 commits since 5608de0: bounded clipboard helpers so a
hung wl-copy or wl-paste cannot freeze Herdr (herdrdev#5583), the remote ready marker
under tcsh login shells (herdrdev#5519), opencode and kilo integrations under
XDG_CONFIG_HOME (herdrdev#5585), a monthly stale-issue workflow, and agent docs that
point at the skill source instead of agent-guide and llms.txt.

No conflicts and no semantic resolutions. The linux clipboard rework arrives as
a new `platform/linux/clipboard.rs` helper module next to the fork's
foreground-process probe, and the stale-close workflow is gated to
`herdrdev/herdr`, so it stays inert in this fork.

Verified: just check (4307 tests, fmt, clippy, Windows lint, docs contract).
@geril07
geril07 merged commit ed65776 into master Oct 30, 2026
7 checks passed
@geril07
geril07 deleted the sync/upstream-master branch October 30, 2026 13:45
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.

2 participants