From b3287c926f2fa3195e867852f94c62a90f49c868 Mon Sep 17 00:00:00 2001 From: Alexander Miroshnichenko Date: Mon, 16 Nov 2026 20:51:14 +0300 Subject: [PATCH] feat(strata): bump 0.2.13 -> 0.2.15 Strata 0.2.14 runs the prompt on its own kernels and vendors llama.cpp (third_party/strata-llama), so the separate llama.cpp fetch for the vision encoder goes. The build keeps upstream's halo flags: MMQ stays out (STRATA_MMQ defaults to OFF), 47 of 48 UD-Q5_K_XL layers run on the fused kernels, and the ROCm 10.1 hipBLASLt table still ships. UD-Q5_K_XL on ms-s1-max, 16K cold prompts: 715 -> ~810 tok/s on the defaults, ~1180 tok/s with the gfx1151 prompt set (unchanged). Bead: nix-overlay-ydg --- .beads/issues.jsonl | 1 + README.md | 9 ++++++--- packages/strata/package.nix | 14 ++++---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.beads/issues.jsonl b/.beads/issues.jsonl index 08d6c61..1e65365 100644 --- a/.beads/issues.jsonl +++ b/.beads/issues.jsonl @@ -53,6 +53,7 @@ {"id":"nix-overlay-vu5","title":"Push main to origin (push blocked in sandbox)","description":"codex-oauth-proxy 1.1.1 is implemented, verified and merged into local main (fast-forward from feat/codex-oauth-proxy). main is ahead of origin/main and has never been pushed. Root cause: the agent sandbox is denied open() on ~/.ssh/known_hosts, so OpenSSH aborts host-key verification for [git.millerson.name]:22002 before authenticating; /etc/ssh/ssh_known_hosts is empty, no SSHFP DNS records exist, HTTPS remote has no credentials. Unblock: run 'git -C /home/minder/GIT/millerson.name/nix-overlay --no-pager push origin main' from a shell that can read ~/.ssh/known_hosts. No code rework needed.","status":"open","priority":1,"issue_type":"task","created_at":"2026-11-12T01:13:59.315348362Z","created_by":"minder","updated_at":"2026-11-12T07:48:23.560248559Z","source_repo":"nix-overlay","compaction_level":0,"original_size":0} {"id":"nix-overlay-wfv","title":"agnix: add package built from source","description":"Add agent-sh/agnix (Rust workspace, linter for AI agent configs) to the overlay. Source build only, no pre-built release binaries.","status":"closed","priority":3,"issue_type":"task","assignee":"minder","created_at":"2026-11-03T11:30:55.381952135Z","created_by":"minder","updated_at":"2026-11-03T12:14:36.548817499Z","closed_at":"2026-11-03T12:14:36.548082403Z","close_reason":"Built from source: nix build .#agnix succeeds (cargo build -p agnix-cli, src+cargo hashes verified), check phase 62 tests pass, agnix 0.60.3 binary lints a fixture SKILL.md","source_repo":"nix-overlay","compaction_level":0,"original_size":0} {"id":"nix-overlay-y5r","title":"Add codex-oauth-proxy systemd user service and Home Manager support","description":"Provide a systemd user service for codex-oauth-proxy and Home Manager programs.codex-oauth-proxy integration. Enabling the HM option must start and enable the user service (equivalent to systemctl --user enable --now); disabling must stop and disable it (equivalent to disable --now). Set ADMIN_API_KEY conditionally from programs.codex-oauth-proxy.admin_api_key without disclosing secret values. Verify activation behavior and document configuration. This issue records the requested follow-up; current task only claims and documents it, without editing package or module files.","acceptance_criteria":"User service and HM enable/disable behavior verified; conditional ADMIN_API_KEY handled without logging secrets; module/package files are changed only in a subsequent implementation task.","status":"tombstone","priority":2,"issue_type":"feature","assignee":"coder_specialist","created_at":"2026-11-12T11:54:48.456917435Z","created_by":"minder","updated_at":"2026-11-12T13:15:34.227130153Z","source_repo":"nix-overlay","deleted_at":"2026-11-12T13:15:34.226145803Z","deleted_by":"minder","delete_reason":"delete","original_type":"feature","compaction_level":0,"original_size":0,"comments":[{"id":1,"issue_id":"nix-overlay-y5r","author":"coder_specialist","text":"User authorized reassignment to coder_specialist for the requested implementation. Ownership investigation only: no source or Git edits in this phase. Planned scope: Home Manager integration, service verification, and configuration documentation.","created_at":"2026-11-12T13:13:10Z"}]} +{"id":"nix-overlay-ydg","title":"strata: bump 0.2.13 -> 0.2.15","description":"Bump packages/strata to v0.2.15 (engine 0.1.60). 0.2.14 moved the prompt path to Strata's own kernels (STRATA_MMQ=OFF default), vendors ggml and llama (third_party/strata-ggml, strata-llama), so the external llama.cpp fetch may go. Keep the ROCm 10.1 hipBLASLt table; recheck prompt speed and the env in nixos-config llama-swap (STRATA_MMQ_KQ needs MMQ built).","status":"closed","priority":2,"issue_type":"task","assignee":"minder","created_at":"2026-11-16T17:22:30.970645702Z","created_by":"minder","updated_at":"2026-11-16T17:51:14.182149529Z","closed_at":"2026-11-16T17:51:14.181662890Z","close_reason":"0.2.15 built and measured on ms-s1-max","source_repo":"nix-overlay","compaction_level":0,"original_size":0,"comments":[{"id":9,"issue_id":"nix-overlay-ydg","author":"minder","text":"Built on ms-s1-max: /nix/store/3r54hafc4bh531z34d31lnhw79mxjhnd-strata-0.2.15 (engine 0.1.61, MMQ off as upstream's halo build, 47/48 layers on fused kernels, ROCm 10.1 table in bin/tuning). UD-Q5_K_XL cold prompts 4K-16K, 16K: 0.2.13 base 715 -> 0.2.15 base ~810 tok/s; with section 5 ~1180 tok/s on both versions. KL vs 0.2.13 base: 0.2.15+s5 mean 0.0155 (agent 16K 0.199), top-1 15/15. STRATA_PF_P1A=1: bit-identical, no effect on Q5_K/Q8_0.","created_at":"2026-11-16T17:51:13Z"}]} {"id":"nix-overlay-yf4","title":"codex-oauth-proxy: fix gpt-6.1-terra normalization","description":"Requests for gpt-6.1-terra are rewritten to gpt-5.5 by normalizeModel because the model is missing from the hardcoded allowlist. The account is not entitled to gpt-5.5, so /v1/chat/completions and /v1/responses return 400 model_not_found. Add modelGPT61Terra to the exact-match switch, modelAllowedEfforts, and modelDefaultEffort in codex-oauth-proxy 1.1.1 via an overlay patch. Verify with nix build .#codex-oauth-proxy and a unit test for the new model.","status":"closed","priority":2,"issue_type":"bug","assignee":"opencode","created_at":"2026-11-12T12:46:01.000023180Z","created_by":"minder","updated_at":"2026-11-12T12:47:40.200015184Z","closed_at":"2026-11-12T12:47:40.199512016Z","close_reason":"Completed: added gpt-6.1-terra to codex-oauth-proxy 1.1.1 via packages/codex-oauth-proxy/gpt-6.1-terra.patch; nix build .#codex-oauth-proxy passes, including new normalize and reasoning-effort tests for gpt-6.1-terra","source_repo":"nix-overlay","compaction_level":0,"original_size":0} {"id":"nix-overlay-ylf","title":"Add open-code-review package","description":"Package alibaba/open-code-review (AI code review CLI, npm @alibaba-group/open-code-review) into the overlay","status":"closed","priority":2,"issue_type":"feature","assignee":"Alexander Miroshnichenko","owner":"alex@millerson.name","created_at":"2026-09-26T07:18:05Z","created_by":"Alexander Miroshnichenko","updated_at":"2026-09-26T07:24:49Z","closed_at":"2026-09-26T07:24:49Z","close_reason":"Closed","source_repo":".","compaction_level":0,"original_size":0} {"id":"nix-overlay-yxj","title":"Add memdoor package","description":"Add https://github.com/guregodevo/memdoor (Go CLI coding/automation agent) to packages/","status":"closed","priority":2,"issue_type":"task","assignee":"minder","created_at":"2026-11-01T18:25:31.524424793Z","created_by":"minder","updated_at":"2026-11-01T22:53:37.479304645Z","closed_at":"2026-11-01T22:53:37.477846036Z","close_reason":"Added packages/memdoor (v1.769.0), builds with upstream Go suite enabled","source_repo":"nix-overlay","compaction_level":0,"original_size":0} diff --git a/README.md b/README.md index b2eb8df..0a93603 100644 --- a/README.md +++ b/README.md @@ -150,11 +150,14 @@ projectors are supplied separately. Run `nix run .#strata -- --help` for server options, or invoke the engine directly with `nix shell .#strata -c strata --help`. For inference, pass `strata-server --engine strata --config /path/to/strata.json`; the upstream -[server configuration](https://github.com/Niko1221/Strata/blob/v0.2.13/serve/server.py) +[server configuration](https://github.com/Niko1221/Strata/blob/v0.2.15/serve/server.py) uses `exe`, `args`, `cwd`, `tokenizer` and `model_name`. Set `exe` to the packaged `strata` executable and use writable model/log paths outside the Nix store. -The ROCm 7.14.1 hipBLASLt tuning table from the reference recipe is not enabled -with ROCm 10; the engine falls back to hipBLAS when no matching table is supplied. +Upstream's gfx1151 hipBLASLt table was calibrated on TheRock 7.14.1; its solution +ids do not exist in ROCm 10.1's hipBLASLt, which reports the same version. The +package ships a table recalibrated against the shared ROCm 10.1 SDK in +`bin/tuning/`, where the engine finds it without `STRATA_HIPBLASLT_TUNING`; +recalibrate it (`tools/hip/tune_hipblaslt`) when the SDK changes. Crucible ships `crucible-server` (also `nix run .#crucible-strix-halo`) and `crucible-engine`. Upstream built the release engine with ROCm 7.2.4 and tested diff --git a/packages/strata/package.nix b/packages/strata/package.nix index c500564..f15f526 100644 --- a/packages/strata/package.nix +++ b/packages/strata/package.nix @@ -10,13 +10,6 @@ therockRocm, }: let - # The vision encoder needs the full llama.cpp tree at Strata's pinned ggml revision. - llama = fetchFromGitHub { - owner = "ggml-org"; - repo = "llama.cpp"; - rev = "3cf03257f219afbe7334045ff7c6a06ac68c627d"; - hash = "sha256-SRGoXa+4ACBCB3eaG9XFYhMN1i0FyPEy9Rrer+dFGYI="; - }; python = python3.withPackages ( ps: with ps; [ jinja2 @@ -40,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "strata"; - version = "0.2.13"; + version = "0.2.15"; src = fetchFromGitHub { owner = "Niko1221"; repo = "Strata"; tag = "v${finalAttrs.version}"; - hash = "sha256-ygLtDYyrwfRKez46xKnPkO7BtY0Q4uMwxlvh3JyUHbE="; + hash = "sha256-ehbQHpljUeclywp0ubGcrGG+xQ35SppRoosVWZLJiDY="; }; nativeBuildInputs = [ @@ -88,9 +81,10 @@ stdenv.mkDerivation (finalAttrs: { cp ${./gfx1151-hipblaslt-100401.txt} tools/hip/gfx1151-hipblaslt-100401.txt ''; + # Vision builds from the vendored third_party/strata-llama (LLAMA_DIR default). postBuild = '' cmake -S ../tools/vision -B ../build-vision -G Ninja \ - -DCMAKE_BUILD_TYPE=Release -DLLAMA_DIR=${llama} \ + -DCMAKE_BUILD_TYPE=Release \ -DSTRATA_VISION_CUDA=OFF -DSTRATA_VISION_HIP=OFF -DSTRATA_PORTABLE=ON cmake --build ../build-vision --target strata-vision -j $NIX_BUILD_CORES '';