diff --git a/eic-spack.sh b/eic-spack.sh
index 804f3bbe..31020e9f 100644
--- a/eic-spack.sh
+++ b/eic-spack.sh
@@ -5,4 +5,6 @@ EICSPACK_ORGREPO="eic/eic-spack"
 
 ## EIC spack commit hash or github version, e.g. v0.19.7
 ## note: nightly builds could use a branch e.g. releases/v0.19
-EICSPACK_VERSION="bfda0ec7a5f511f40048a2866fa03dda78d0cdce"
+## TESTING: head of eic-spack#986 (native HTTP, no supergateway, py-* deps
+## from the spack-packages#5637 cherry-pick); bump to the merge SHA before undrafting.
+EICSPACK_VERSION="646ef8ccdd18ba3c69b91331c08dd50e4715210d"
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index 553cf0a4..fc3df1b5 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -158,6 +158,9 @@ packages:
     externals:
     - spec: egl@1.5.0
       prefix: /usr
+  eic-mcp:
+    require:
+    - '@main'  # pin to the first tagged release once eic/eic-mcp tags one
   eic-opticks:
     require:
     - '@0.3.0'
@@ -398,6 +401,9 @@ packages:
   opencascade:
     require:
     - '@7.8.1:'
+  opencode:
+    require:
+    - '@1.18.3:'
     - +application_framework -vtk
   opengl:
     buildable: False
@@ -539,6 +545,11 @@ packages:
   py-matplotlib:
     require:
     - '@3.10'  # avoid FT_Render_Glyph errors possibly due to https://github.com/matplotlib/matplotlib/pull/30059
+  py-mcp:
+    require:
+    - '@1.28:'
+    # no +cli: the typer-based mcp CLI pins py-click@:8.1.8, which cannot
+    # unify with the environment's click 8.3+ (flask); servers need mcp core
   py-mplhep:
     require:
     - '@0.4.0:'
@@ -651,6 +662,9 @@ packages:
     - '@6.40.04'
     - cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +python +root7 +tmva +tmva-sofie +x +xrootd +ssl
     - any_of: [+opengl +webgui, -opengl -webgui]
+  rucio-eic-mcp-server:
+    require:
+    - '@main'  # native streamable HTTP; pin to '@0.2.0:' once v0.2.0 is tagged
   sherpa:
     require:
     - '@3.0.1'
@@ -707,6 +721,9 @@ packages:
   timeframebuilder:
     require:
     - '@0.9.1:'
+  uproot-mcp-server:
+    require:
+    - '@main'  # native streamable HTTP; pin to '@0.2.0:' once v0.2.0 is tagged
   valgrind:
     require:
     - '@3.20.0:'
@@ -720,9 +737,15 @@ packages:
     require:
     - '@5.7.0:'
     - cxxstd=20 -davix +python +scitokens-cpp
+  xrootd-mcp-server:
+    require:
+    - '@main'  # native streamable HTTP; pin to '@0.2.0:' once v0.2.0 is tagged
   yoda:
     require:
     - '@2.1.0:'
+  zenodo-mcp-server:
+    require:
+    - '@0.1.0:'
   zlib-api:
     require:
     - zlib-ng
diff --git a/spack-environment/xl/spack.yaml b/spack-environment/xl/spack.yaml
index e3c8884e..dd730cc0 100644
--- a/spack-environment/xl/spack.yaml
+++ b/spack-environment/xl/spack.yaml
@@ -28,6 +28,7 @@ spack:
   - doxygen
   - east
   - edm4hep
+  - eic-mcp
   - eic-smear
   - eicsimubeameffects
   - eigen
@@ -69,6 +70,7 @@ spack:
   - ollama
   - onnx
   - opencascade
+  - opencode
   - osg-ca-certs
   - pandorasdk
   - pelican
@@ -128,6 +130,7 @@ spack:
   - py-yapf
   - rivet
   - root
+  - rucio-eic-mcp-server
   - timeframebuilder
   - sherpa
   - simsipm
@@ -136,6 +139,7 @@ spack:
   - spdlog
   - stow
   - strace
+  - uproot-mcp-server
   - valgrind
   - xeyes
   - xrootd
diff --git a/spack-packages.sh b/spack-packages.sh
index dcb69260..bd283ea2 100644
--- a/spack-packages.sh
+++ b/spack-packages.sh
@@ -45,6 +45,8 @@ c44cd71db91d6e6c68cb604dcb87311b49b1bedb
 683c5a698d88d657a99f3adefee0fe98d30927ae
 409826414a2221be56011f8f0f912905dae558cd
 63b8b9c3ac8ddcb2b9aafcd8160ff33bd6210f51
+d18c9ad43ea50d71e666c8a859da3293e4776c19
+55be3f79a559d1e8f5ae8dffd1516569f444b5d0
 ---
 ## Optional hash table with comma-separated file list
 ## For these commits, the cherry-pick will be restricted to the listed files only.
@@ -87,3 +89,5 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \
 ## 683c5a698d88d657a99f3adefee0fe98d30927ae: dd4hep: url_for_version for master version
 ## 409826414a2221be56011f8f0f912905dae558cd: podio: Add version 1.8 and new parquet variant
 ## 63b8b9c3ac8ddcb2b9aafcd8160ff33bd6210f51: edm4hep: patch for new podio arrow targets
+## d18c9ad43ea50d71e666c8a859da3293e4776c19: py-mcp: new package (with missing deps, py-pyjwt 2.10.1) (#5637)
+## 55be3f79a559d1e8f5ae8dffd1516569f444b5d0: opencode, bun: new packages (#5639)