Commit Graph

11 Commits

Author SHA1 Message Date
alex 589936cd8d feat(marmel): add arbitrary HTTP headers patch
CI / check (push) Has been cancelled
Apply upstream 56d0b1f so top-level, specialist, validator and MCP request headers can be configured. nix build .#marmel passes with the patch.
2026-11-09 10:03:47 +03:00
alex e569243ae4 chore(marmel): bump to afcc1dc (main), give checks a usable TMPDIR
CI / check (push) Has been cancelled
Track upstream main at afcc1dc971ae4acd59b157f031d4bdbc9d52a7d0
(2026-11-07), 22 commits past the de3e99c8 pin. Upstream still ships no
tags or releases and Cargo.toml still reads version 1.0.0, so the dated
0-unstable-* string stays. cargoHash moves on its own: the new
crates/zim-search workspace member grew Cargo.lock from 399 to 621
entries, and cargo vendor hashes the whole workspace.

The real packaging work is the TMPDIR override appended to preCheck.
Upstream's new harness::fs::path_tests scratch-root helper puts its
scratch dirs under <cwd>/target/ and first asserts that root lies
outside std::env::temp_dir(). The build sandbox exports TMPDIR=/build,
which is an ancestor of the unpacked source at /build/source, so that
premise check tripped and all 8 path-security tests failed with
"scoped root /build/source/target/marmel-path-tests-N sits inside the
temp allow-list entry /build". Pointing TMPDIR at
/tmp/marmel-check-tmp, outside $NIX_BUILD_TOP, restores upstream's
premise, so all 8 tests keep running for real instead of being filtered
out of cargoTestFlags. Build-time only; the installed binary is
untouched.

Two derivation comments carried stale facts and are corrected:

- meta.license claimed the repository shipped no LICENSE file and that
  Cargo.toml had no license field. Upstream c98179d023 (Na1w/marmel#40)
  added a root LICENSE file and declared license = "MIT" in Cargo.toml,
  so the comment now records that MIT is asserted in the README,
  Cargo.toml and LICENSE alike; lib.licenses.mit was already the right
  value.
- the cargoTestFlags comment quoted "the lib suite passes at 1055
  tests". Roughly 500 test fns landed since (TUI, fs-path, PTY and
  dispatch-integrity suites), so the figure is dropped rather than
  refreshed: nothing checks it and it rots on every bump.

Also adds the two research notes behind the bump under docs/: the
de3e99c8..afcc1dc9 upstream delta audit and the update-tooling findings.

Verified: clean nix build .#marmel including the serialised test suite
(--test-threads=1) — 2146 passed, 0 failed.
2026-11-07 16:54:02 +03:00
alex e2f24b0876 chore(packages): bump pins to current upstream releases
- awg-tool 0.4.0 -> 0.5.0
- awgen 0.1 -> 0.2
- codeaf 0.7.1 -> 0.8.2
- ds4 -> ee7e840 (2026-10-21)
- freebuff 0.2.19 -> 0.2.34
- graphify 0.9.77 -> 0.9.95 (add pyyaml dependency)
- hipengine 0.6.1 -> 0.8.3
- kubernetes-mcp-server 0.0.67 -> 0.0.69 (build with go_1_27)
- kyojin 1.3 -> 1.7.1 (drop obsolete setup.py/pyproject patches, ship
  gr_mix_hip from the package, add ninja runtime dependency)
- marmel -> de3e99c (2026-10-23)
- omniroute 3.8.50 -> 3.8.52
- open-code-review 1.12.12 -> 1.13.3 (build with go_1_27)
- pilotdeck 2026.10.17 -> 2026.10.20
- radar 1.16.2 -> 1.18.0
- traycer 1.4.2 -> 1.5.1

Verified: nix build passes for every bumped package; kyojin.tests.jit
compiles all five JIT kernels.

🤖 Generated with Codebuff
Co-Authored-By: Codebuff <noreply@codebuff.com>
2026-10-24 14:09:34 +03:00
alex adbed5f3c0 chore(marmel): bump to b08923ea (main), drop obsolete patches
CI / check (push) Has been cancelled
Upstream fixed both reasons for the local patches, so neither is needed:

- 62cb75634c6e (#16) reports a missing TLS trust store instead of
  panicking through reqwest::Client::default(); the env-cleared test
  child now stays reachable without SSL_CERT_FILE, which is what
  session-boot-trust-store.patch existed to work around.
- b08923eaef60 (#17) adds /nix/store and /gnu/store to
  BUILTIN_READONLY_PATHS; the checkPhase rebuild confirms the store rule
  works on a Nix host: test_internal_sandbox_cross_directory_rename and
  test_internal_sandbox_extra_readonly_paths_never_grant_write run for
  real, no SKIP line is printed, and only the /etc/resolv.conf DNS test
  stays filtered. Lib suite: 1055 passed, 1 filtered; all integration
  suites green.

passthru.updateScript now passes the bare attribute name: nix-update
rejects ".#marmel" with AttributePathError, so the documented bump path
was broken. Verify with `nix-update --flake marmel --use-update-script`.
2026-10-19 09:52:45 +03:00
alex cb3f338e57 chore(marmel): bump to 981b35b (main)
CI / check (push) Has been cancelled
Track upstream main at 981b35b0d356e56de429ab4198e427ccfbe7d85f
(2026-10-17). Cargo.lock is unchanged between the two revisions, so
cargoHash stays; src hash regenerated by nix-update. Version string
follows nix-update's 0-unstable-* dated scheme now.

Both downstream patches still apply and upstream issues stay open
(Na1w/marmel#14, #13, fix PR #16 unmerged), so nix-overlay-pnb and
nix-overlay-nn2 remain blocked. Lib suite now passes at 1030 tests
with the same single DNS sandbox filter; comment updated.
2026-10-18 14:51:58 +03:00
alex 51dd95c19c fix(marmel): allow /nix/store in the Landlock sandbox
The upstream ruleset allow-lists FHS paths only (/usr, /bin, /lib, /opt,
/etc, /var), and every executable here resolves below the store: /bin/sh
is a symlink into /nix/store/<hash>-bash-5.3p9/bin/sh. Landlock matches
the resolved target rather than the symlinked view, so the harness
re-entry (`marmel --internal-sandbox-exec`) cannot exec the shell and
every shell tool call comes back as "Failed to exec shell in sandbox:
Permission denied (os error 13)" with exit 1. The sandbox is on by
default, so the only workaround on a Nix host is MARMEL_DISABLE_SANDBOX=1,
which drops the protection altogether.

The patch adds "/nix/store" to the read-only+execute list, guarded by
exists() like its neighbours. Store paths are world-readable by design,
so the added reach is nothing a local user did not already have. Checked
against the built binary: sandboxed exec works, git runs, workspace
writes work, ~/.ssh and /root stay blocked.

Tested: nix build .#marmel passes, lib suite 966 passed / 0 failed with
one filter. test_internal_sandbox_cross_directory_rename no longer needs
a skip and passes; test_internal_sandbox_exec_dev_null_and_dns stays
skipped for its own reason, the no-network build sandbox has no
/etc/resolv.conf. Temporary downstream fix, drop it once upstream takes
the store path (nix-overlay-5ml).
2026-10-16 16:19:18 +03:00
alex 892f30e82a fix(marmel): bump to 3f238ff, give e2e child a trust store
CI / check (push) Has been cancelled
Track main at 3f238ff (per-role reasoning_effort, #12), 21 commits past
d6627d7 ("1.0.0 (#6)"). cargoHash is unchanged: Cargo.lock is identical
across that range, so the vendored tree is byte-for-byte the same.

The new tests/test_session_boot.rs spawns the real binary with
env_clear(), which drops SSL_CERT_FILE. rustls-native-certs is then left
with a fixed list of /etc paths to probe, none of which exist in the Nix
sandbox, so the child dies in reqwest::Client::new() and four exit-code
assertions observe the panic's 101. The patch forwards the runner's
SSL_CERT_FILE to the child and leaves every assertion intact.

The underlying defect is upstream's rather than Nix's:
src/llm/client.rs builds its client with unwrap_or_default() on a
Result<Client, reqwest::Error>, and reqwest's Client::default() is
Client::new(), which repeats the same build and .expect()s it. The
fallback can therefore never recover; it turns a reportable "no CA
certificates" error into a panic. Reproduced on a stock busybox image
with no /etc/ssl at all, so it hits any minimal container, not just
sandboxed builds.

Tested: 1251 tests pass across 31 targets, 0 failures.
2026-10-16 14:32:15 +03:00
alex c08c444a39 fix(marmel): skip the two Landlock sandbox-exec tests
CI / check (push) Has been cancelled
The lib suite failed in the Nix sandbox:

    harness::sandbox::tests::test_internal_sandbox_exec_dev_null_and_dns
    harness::sandbox::tests::test_internal_sandbox_cross_directory_rename
    Failed to exec shell in sandbox: Permission denied (os error 13)

apply_landlock_linux() allow-lists FHS paths only, and Landlock matches
inodes rather than symlinked views, so nothing under /nix/store can be
executed once the ruleset is applied; /bin/sh here is a store path. The
build sandbox also drops the /usr, /lib, /run and /var rules, since those
paths do not exist there, and has no /etc/resolv.conf without network, so
neither test can pass however the package is written. 342 of 344 tests run,
all green.

The same denial applies at runtime: every shell tool call goes through
marmel --internal-sandbox-exec and fails on NixOS. Tracked as
nix-overlay-5ml. Upstream main still carries the FHS-only list.
2026-10-06 22:31:40 +03:00
alex 029d84940d chore(marmel): bump to 1.0.0
Pin upstream release commit d6627d7c ("1.0.0 (#6)"), update src hash.
Cargo.lock is byte-identical to the previous pin, so cargoHash is unchanged.
2026-10-06 19:20:49 +03:00
alex 6013b17aad chore(packages): bump pins to current upstream releases
Refresh every package pin so the overlay stops carrying versions upstream
has moved past, and repair the pins where an automated bump had produced a
version that no longer resolves:

- graphify 0.9.61 -> 1.0.0 and back to tag tracking: the branch-tracking
  update script generated v0.9.77-unstable-<date> for a rev = "v${version}"
  src, a tag that never existed
- radar 1.13.1 -> 1.16.2 (upstream retagged its releases as k8s-ui-v*)
- llama-cpp b9645 -> b11439
- hipengine 0.5.0 -> 0.6.1, traycer 1.3.0 -> 1.4.2, freetoken 0.1.2 -> 0.1.3
- awg-tool 0.4.0, freebuff 0.2.19, kubernetes-mcp-server 0.0.67,
  marmel 0-unstable-2026-10-05, open-code-review 1.12.12,
  ds4 0-unstable-2026-09-20
- version-string normalisation for the branch-tracked packages already at
  their newest commit (g3, haivemind, shardr, skillsmcp)

Every changed src hash was re-fetched and verified. omniroute stays at
3.8.50: 3.8.51 changes its npm lockfile, so its npmDepsHash would have to
be recomputed before the bump is usable.

🤖 Generated with Codebuff
Co-Authored-By: Codebuff <noreply@codebuff.com>
2026-10-06 16:46:26 +03:00
alex d74788a4cb feat(packages): Add marmel autonomous coding agent
Pin Na1w/marmel to commit fd551ae. Upstream publishes no tags or
releases, so the version uses the shape nix-update generates for a
tagless repository, keeping `nix-update --version=branch=main` usable.

The test suite runs green (325 lib tests plus all integration suites)
with two accommodations, both documented in the derivation:

- Export SSL_CERT_FILE from nixpkgs cacert. rustls refuses to construct
  a reqwest::Client without a system trust store, which failed 38 tests
  with "No CA certificates were loaded from the system".
- Serialise the test harness. The lib suite shares process-global worker
  registries and steer/abort buses, so manager-loop tests fail
  nondeterministically on parallel threads: one unchanged derivation
  produced 3 failures, then 1 failure, then 0 with --test-threads=1.
  No test is skipped or filtered.

Annotated example configs are installed to share/doc/marmel/examples/.
Role prompts are embedded via include_str!, so there is no runtime data
directory. Upstream README states MIT but ships no LICENSE file and no
Cargo.toml license field.
2026-09-14 12:31:39 +03:00