Fryuni/llm-agents.nix
Watch
1
0
Fork
You've already forked llm-agents.nix
 0
Code Issues Pull requests 2 Activity

Resolve upstream main merge conflicts #11

Open
Fryuni wants to merge 159 commits from automation/upstream-main-20260811-080205 into main
pull from: automation/upstream-main-20260811-080205
merge into: Fryuni:main
Conversation 0 Commits 159 Files changed 83 +8103 -1031
Fryuni commented 2026-08-11 11:35:37 +00:00
Owner
Copy link

Summary

Merged upstream/main at 84f2e24c315ed510b4c16990408d8a5f98aff475 into the fork's local main lineage.

Conflicts resolved

  • lib/default.nix: preserved the fork's fryuni maintainer and added upstream's RyougiShiki-214 maintainer.
  • packages/omp/bun.nix: preserved the generated dependency set for the fork-specific Fryuni/oh-my-pi source.
  • packages/omp/compile-standalone.ts: retained upstream's immutable Bun executable-template compile helper.
  • packages/omp/package.nix: combined the fork source/workspace fixes with upstream docs generation, immutable Bun 1.3.14 template support, system libopus changes, and optional PipeWire support.
  • Kept PipeWire's wayland-pipewire feature conditional because the currently pinned fork source does not expose that Cargo feature.
  • Corrected OpenWiki's maintainer reference from the undefined lferraz attribute to the fork's fryuni attribute after the maintainer check exposed it.

Validation

  • nix fmt — passed.
  • nix build --accept-flake-config .#omp --print-build-logs — passed, including OMP's install checks.
  • nix flake check --print-build-logs — passed on x86_64-linux; Nix reported aarch64-darwin and aarch64-linux as incompatible/omitted systems.

The initial validation attempts exposed the OpenWiki maintainer mismatch and the fork source's missing wayland-pipewire feature; both were fixed before the final successful runs.

## Summary Merged `upstream/main` at `84f2e24c315ed510b4c16990408d8a5f98aff475` into the fork's local `main` lineage. ## Conflicts resolved - `lib/default.nix`: preserved the fork's `fryuni` maintainer and added upstream's `RyougiShiki-214` maintainer. - `packages/omp/bun.nix`: preserved the generated dependency set for the fork-specific `Fryuni/oh-my-pi` source. - `packages/omp/compile-standalone.ts`: retained upstream's immutable Bun executable-template compile helper. - `packages/omp/package.nix`: combined the fork source/workspace fixes with upstream docs generation, immutable Bun 1.3.14 template support, system libopus changes, and optional PipeWire support. - Kept PipeWire's `wayland-pipewire` feature conditional because the currently pinned fork source does not expose that Cargo feature. - Corrected OpenWiki's maintainer reference from the undefined `lferraz` attribute to the fork's `fryuni` attribute after the maintainer check exposed it. ## Validation - `nix fmt` — passed. - `nix build --accept-flake-config .#omp --print-build-logs` — passed, including OMP's install checks. - `nix flake check --print-build-logs` — passed on `x86_64-linux`; Nix reported `aarch64-darwin` and `aarch64-linux` as incompatible/omitted systems. The initial validation attempts exposed the OpenWiki maintainer mismatch and the fork source's missing `wayland-pipewire` feature; both were fixed before the final successful runs.
Merge upstream/main and preserve fork-specific omp dependencies
Some checks failed
update-flake.yml / Merge upstream/main and preserve fork-specific omp dependencies (push) Failing after 0s
Details
c98d83a844
omp: update to 6fd20af974
Some checks failed
update-flake.yml / omp: update to `6fd20af974` (push) Failing after 0s
Details
f11c0d0f0a
Merge remote-tracking branch 'upstream/main'
Some checks failed
update-flake.yml / Merge remote-tracking branch 'upstream/main' (push) Failing after 0s
Details
0b6bb453bc
 
https://ampcode.com/chronicle
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/MrLesk/Backlog.md/releases
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://docs.factory.ai/changelog/cli-updates
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/iOfficeAI/AionUi/releases/tag/v2.1.53
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
amp: 0.0.1786320433-geeee54 -> 0.0.1786378557-g73e9b1
https://github.com/router-for-me/CLIProxyAPI/releases
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/sipyourdrink-ltd/bernstein/releases/tag/v3.14.159
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
backlog-md: 1.50.0 -> 1.50.1
https://github.com/github/copilot-cli/releases/tag/v1.0.79
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
droid: 0.190.0 -> 0.191.1
cli-proxy-api: 7.2.127 -> 7.2.128
bernstein: 3.13.0 -> 3.14.159
copilot-cli: 1.0.78 -> 1.0.79
https://github.com/anomalyco/opencode/commits/v2
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/XiaomiMiMo/MiMo-Code/releases/tag/v0.1.11
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
opencode2: 0.0.0-next-17081 -> 0.0.0-next-17108
https://github.com/alibaba/open-code-review/releases/tag/v1.9.0
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
mimo-code: 0.1.10 -> 0.1.11
open-code-review: 1.8.10 -> 1.9.0
https://github.com/always-further/nono/releases/tag/v0.73.0
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/parallel-web/parallel-web-tools/releases/tag/v0.7.1
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/anomalyco/opencode/releases/tag/v1.18.16
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
parallel-cli: 0.7.1 -> 0.7.1
https://qoder.com/changelog
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/marcus/sidecar/releases/tag/v0.94.2
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/code-yeongyu/oh-my-openagent/releases/tag/v5.0.0-beta.5
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
qoder-cli: 1.1.17 -> 1.1.18
https://github.com/backnotprop/plannotator/releases/tag/v0.26.7
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/QwenLM/qwen-code/releases
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
sidecar: 0.93.0 -> 0.94.2
aionui: 2.1.52 -> 2.1.53
plannotator: 0.26.6 -> 0.26.7
opencode: 1.18.15 -> 1.18.16
nono: 0.72.0 -> 0.73.0
qwen-code: 0.21.8 -> 0.21.9
oh-my-opencode: 5.0.0-beta.4 -> 5.0.0-beta.5
https://github.com/raine/aven/blob/v0.1.28/CHANGELOG.md
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://ampcode.com/chronicle
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
amp: 0.0.1786378557-g73e9b1 -> 0.0.1786392814-g62eb36
https://github.com/AltanS/collie/releases/tag/v0.27.0
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/editor-code-assistant/eca/releases/tag/0.153.1
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
eca: 0.153.0 -> 0.153.1
collie: 0.26.0 -> 0.27.0
https://github.com/github/copilot-language-server-release/releases/tag/1.529.0
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/anomalyco/opencode/commits/v2
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/esengine/DeepSeek-Reasonix/releases/tag/v1.23.0
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
opencode2: 0.0.0-next-17108 -> 0.0.0-next-17114
https://github.com/github/spec-kit/releases/tag/v0.16.2
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/pingdotgg/t3code/releases/tag/v0.0.33
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
spec-kit: 0.16.1 -> 0.16.2
copilot-language-server: 1.528.0 -> 1.529.0
reasonix: 1.22.0 -> 1.23.0
70ce2343 -> afb4584a

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/parallel-web/parallel-web-tools/releases/tag/v0.8.1
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
parallel-cli: 0.7.1 -> 0.8.1
t3code: 0.0.32 -> 0.0.33
flake.lock: Update nixpkgs
aven: 0.1.27 -> 0.1.28
https://github.com/anthropics/claude-code/releases
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://ampcode.com/chronicle
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/vercel-labs/agent-browser/releases/tag/v0.34.0
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
amp: 0.0.1786392814-g62eb36 -> 0.0.1786406864-g1583b9
https://github.com/just-every/code/releases/tag/v0.6.172
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/anomalyco/opencode/commits/v2
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/backnotprop/plannotator/releases/tag/v0.26.8
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
opencode2: 0.0.0-next-17114 -> 0.0.0-next-17124
https://github.com/letta-ai/letta-code/releases
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/marcus/sidecar/releases/tag/v0.95.0
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
claude-code: 2.1.226 -> 2.1.227
plannotator: 0.26.7 -> 0.26.8
sidecar: 0.94.2 -> 0.95.0
agent-browser: 0.33.2 -> 0.34.0
letta-code: 0.30.15 -> 0.30.16
code: 0.6.171 -> 0.6.172
https://antigravity.google/cli
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
antigravity-cli: 1.1.11 -> 1.1.12
https://docs.factory.ai/changelog/cli-updates
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
droid: 0.191.1 -> 0.193.0
https://github.com/github/copilot-language-server-release/releases/tag/1.530.0
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/Kilo-Org/kilocode/releases/tag/v7.4.21
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
copilot-language-server: 1.529.0 -> 1.530.0
https://github.com/anomalyco/opencode/commits/v2
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
kilocode-cli: 7.4.20 -> 7.4.21
opencode2: 0.0.0-next-17124 -> 0.0.0-next-17141
https://git.swamp-club.com/swamp-club/swamp/src/tag/v20260811.005918.0-sha.c8953e9e
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
https://github.com/letta-ai/letta-code/releases
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
swamp: 20260809.004828.0-sha.b61c9de2 -> 20260811.005918.0-sha.c8953e9e
https://github.com/openclaw/mcporter/releases
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
afb4584a -> fe6deff5

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
letta-code: 0.30.16 -> 0.30.17
mcporter: 0.13.3 -> 0.13.4
flake.lock: Update nixpkgs
omp: compile with immutable Bun 1.3.14 template
The ability for it to take screenshots etc is gated behind
a cargo feature for Wayland, apparently because their CI cannot
build it so we need to explicitly enable it.

Always including this on linux is fine because on X11
systems there will be no `WAYLAND_DISPLAY` defined so
it will still use the X11 backend.
Many comments merely narrated the adjacent code or repeated echo
statements, adding noise without explaining intent. Keep only the
non-obvious rationale (Bun template workaround, reproducibility fixes,
nightly-feature bootstrap) and shorten it to the essentials.
We do not require per-file copyright headers in this repo, so silence
the flake8-copyright rules to avoid noise if preview rules get enabled.
npm install --package-lock-only omits lock entries for platform optional
dependencies declared by bundled dependency copies (e.g. esbuild, tsx),
which makes npm ci reject the generated lockfile. Add an opt-in
supplement_optional_deps flag that resolves the missing packages and
merges their entries into the lockfile so packages like paperclip can
use the shared update_npm_package flow instead of a custom script.
feat(omp): build and link with pipewire for computer use
paseo-desktop: 0.2.5 -> 0.3.1
Make Paperclip available as an agent-team control plane while preserving reproducible offline installation from its published npm bundle. Redirect embedded database startup to nixpkgs PostgreSQL because upstream platform archives rely on FHS-linked binaries that cannot run reliably on NixOS.
paperclip: init at 2026.722.0
Python 3.14 refactored ThreadPoolExecutor around WorkerContext, so
Hermes' DaemonThreadPoolExecutor (which mirrors CPython <=3.13
internals) fails every tool call with
AttributeError: 'DaemonThreadPoolExecutor' object has no attribute
'_initializer'. Carry a small patch that passes the 3.14 worker
context while keeping the <=3.13 code path, and add an install-check
that submit() actually executes work.

Fixes #7725
Upstream pins agent-client-protocol==0.9.0, but the bare dependency
resolved to nixpkgs' 0.11.x whose regenerated ACP schema drops
ModelInfo/SetSessionModelResponse/SessionModelState, so hermes-acp
ImportErrors at startup while the build stays green (extras are not
covered by the runtime deps check). Override the dependency to 0.9.0
and assert acp_adapter.server imports.

Fixes #7650
Token-efficient MCP CLI client. Zero-dependency Python, built from
the GitHub tag because upstream is not published on PyPI.

Co-Authored-By: Claude Fable 5 <[email protected]>
Claude-Session: https://claude.ai/code/session_016gvyqKkEPBeMgSd3khpnf9
hermes-agent: fix Python 3.14 tool calls and pin agent-client-protocol to 0.9.0
qoder-cli-cn copied qoder-cli's package.nix and update.py almost
verbatim. Reuse the qoder-cli derivation via overrideAttrs and move the
shared manifest update logic into an update_manifest_binaries flow so
both update scripts are just configuration. This also drops the local
hex_to_sri copy in favour of updater.hash.
mcptoon: init at 0.1.0
qoder-cli-cn: init at 1.1.17
Pull in formatelf's new prepend layout for binaries with a .bun section,
so bun-based outputs patched by the auto-formatelf hook stay valid
templates for 'bun build --compile' (issue #7598). Dropping omp's
pristine-template workaround additionally needs a bun release with
oven-sh/bun#31024.

Verified: pkgs-formatelf, pkgs-qmd and pkgs-omp checks pass on
x86_64-linux.

Signed-off-by: Jörg Thalheim <[email protected]>
The pinned nixpkgs now disables the two timing-sensitive retry tests of
opentelemetry-exporter-otlp-proto-grpc upstream, so the darwin-only
python override that skipped its whole test suite is no longer needed.

Verified: pkgs-bernstein passes on x86_64-linux and aarch64-darwin.

Closes #6712

Signed-off-by: Jörg Thalheim <[email protected]>
bernstein: drop darwin otel-exporter-otlp-proto-grpc test workaround
Upstream now pins setuptools==83.0.0 in build-system.requires, which
nixpkgs' setuptools satisfies, so the build-time dependency check no
longer needs to be skipped.

The firecrawl-py metadata override from issue #7211 is still needed:
nixpkgs' firecrawl-py 2.8.0 still fails its metadata check.

Verified: pkgs-hermes-agent passes on x86_64-linux and aarch64-darwin.
Signed-off-by: Jörg Thalheim <[email protected]>
hermes-agent: drop setuptools skip-dependency-check workaround
audiopus_sys only compiles its bundled opus (which needs the
CMAKE_POLICY_VERSION_MINIMUM=3.5 workaround under cmake 4.x) when
pkg-config cannot find a system opus. Provide libopus on all platforms
instead of only Linux, so the bundled cmake build is never used and
both cmake and the env var can go.

Fixes #7212

Reported upstream as can1357/oh-my-pi#8219.
The package builds the community-maintained Hermes One companion app
(fathah/hermes-desktop), not the official Hermes Desktop that
NousResearch ships in hermes-agent's apps/desktop workspace. Free up
the hermes-desktop name for the official app and match the community
project's own branding (issue #7249).

Verified: pkgs-hermes-one passes on x86_64-linux and aarch64-darwin.
Signed-off-by: Jörg Thalheim <[email protected]>
formatelf: 0-unstable-2025-06-11 -> 0-unstable-2026-08-11
Keep the old attribute as a deprecation shim (warnOnInstantiate, hidden
from docs) so existing references keep working. Drop it after the usual
migration period, or reuse the name for the official NousResearch
desktop app (issue #7249).

Signed-off-by: Jörg Thalheim <[email protected]>
hermes-desktop: rename to hermes-one
omp: link system libopus on darwin, drop CMAKE_POLICY_VERSION_MINIMUM
This pull request has changes conflicting with the target branch.
  • lib/default.nix
  • packages/omp/compile-standalone.ts
  • packages/omp/package.nix
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin automation/upstream-main-20260811-080205:automation/upstream-main-20260811-080205
git switch automation/upstream-main-20260811-080205

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff automation/upstream-main-20260811-080205
git switch automation/upstream-main-20260811-080205
git rebase main
git switch main
git merge --ff-only automation/upstream-main-20260811-080205
git switch automation/upstream-main-20260811-080205
git rebase main
git switch main
git merge --no-ff automation/upstream-main-20260811-080205
git switch main
git merge --squash automation/upstream-main-20260811-080205
git switch main
git merge --ff-only automation/upstream-main-20260811-080205
git switch main
git merge automation/upstream-main-20260811-080205
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
Fryuni/llm-agents.nix!11
No description provided.