Merge branch 'main' into pip

2026-05-24 07:11:32 -07:00 · 2026-05-24 07:11:32 -07:00 · 2fdfe24fb1
commit 2fdfe24fb1
parent e2215c9d11 9c5d751c66
15 changed files with 351 additions and 138 deletions
--- a/.github/workflows/studio-windows-api-smoke.yml
+++ b/.github/workflows/studio-windows-api-smoke.yml
@ -170,20 +170,6 @@ jobs:
          fi
          cygpath -w "$SHIM_DIR" >> "$GITHUB_PATH"

-      - name: Patch Studio venv with full typer / pydantic dep trees
-        # Belt-and-suspenders: install.ps1's --no-deps install of
-        # no-torch-runtime.txt drops typer's and pydantic's runtime
-        # deps unless explicitly pinned. Re-install the ones whose
-        # deps don't pull torch.
-        run: |
-          STUDIO_PY=~/.unsloth/studio/unsloth_studio/Scripts/python.exe
-          if [ ! -f "$STUDIO_PY" ]; then
-            echo "::error::Studio venv python not at $STUDIO_PY"
-            ls -la ~/.unsloth/studio/ || true
-            exit 1
-          fi
-          "$STUDIO_PY" -m pip install --upgrade typer pydantic huggingface_hub
-
      - name: Install pyjwt for the JWT-expiry forge test
        run: python -m pip install 'pyjwt>=2.6'

--- a/.github/workflows/studio-windows-inference-smoke.yml
+++ b/.github/workflows/studio-windows-inference-smoke.yml
@ -190,20 +190,6 @@ jobs:
          fi
          cygpath -w "$SHIM_DIR" >> "$GITHUB_PATH"

-      - name: Patch Studio venv with full typer / pydantic dep trees
-        # Belt-and-suspenders: install.ps1's --no-deps install of
-        # no-torch-runtime.txt drops typer's and pydantic's runtime
-        # deps unless explicitly pinned. Re-install the ones whose
-        # deps don't pull torch.
-        run: |
-          STUDIO_PY=~/.unsloth/studio/unsloth_studio/Scripts/python.exe
-          if [ ! -f "$STUDIO_PY" ]; then
-            echo "::error::Studio venv python not at $STUDIO_PY"
-            ls -la ~/.unsloth/studio/ || true
-            exit 1
-          fi
-          "$STUDIO_PY" -m pip install --upgrade typer pydantic huggingface_hub
-
      - name: Install OpenAI + Anthropic Python SDKs
        run: python -m pip install 'openai>=1.50' 'anthropic>=0.40'

@ -543,20 +529,6 @@ jobs:
          fi
          cygpath -w "$SHIM_DIR" >> "$GITHUB_PATH"

-      - name: Patch Studio venv with full typer / pydantic dep trees
-        # Belt-and-suspenders: install.ps1's --no-deps install of
-        # no-torch-runtime.txt drops typer's and pydantic's runtime
-        # deps unless explicitly pinned. Re-install the ones whose
-        # deps don't pull torch.
-        run: |
-          STUDIO_PY=~/.unsloth/studio/unsloth_studio/Scripts/python.exe
-          if [ ! -f "$STUDIO_PY" ]; then
-            echo "::error::Studio venv python not at $STUDIO_PY"
-            ls -la ~/.unsloth/studio/ || true
-            exit 1
-          fi
-          "$STUDIO_PY" -m pip install --upgrade typer pydantic huggingface_hub
-
      - name: Reset auth + boot Studio (API-only, default tool policy)
        run: |
          unsloth studio reset-password
@ -982,20 +954,6 @@ jobs:
          fi
          cygpath -w "$SHIM_DIR" >> "$GITHUB_PATH"

-      - name: Patch Studio venv with full typer / pydantic dep trees
-        # Belt-and-suspenders: install.ps1's --no-deps install of
-        # no-torch-runtime.txt drops typer's and pydantic's runtime
-        # deps unless explicitly pinned. Re-install the ones whose
-        # deps don't pull torch.
-        run: |
-          STUDIO_PY=~/.unsloth/studio/unsloth_studio/Scripts/python.exe
-          if [ ! -f "$STUDIO_PY" ]; then
-            echo "::error::Studio venv python not at $STUDIO_PY"
-            ls -la ~/.unsloth/studio/ || true
-            exit 1
-          fi
-          "$STUDIO_PY" -m pip install --upgrade typer pydantic huggingface_hub
-
      - name: Install OpenAI + Anthropic Python SDKs
        run: python -m pip install 'openai>=1.50' 'anthropic>=0.40'

--- a/.github/workflows/studio-windows-ui-smoke.yml
+++ b/.github/workflows/studio-windows-ui-smoke.yml
@ -208,20 +208,6 @@ jobs:
          cygpath -w "$SHIM_DIR" >> "$GITHUB_PATH"
          echo "Added Studio shim dir to PATH: $(cygpath -w "$SHIM_DIR")"

-      - name: Patch Studio venv with full typer / pydantic dep trees
-        # Belt-and-suspenders: install.ps1's --no-deps install of
-        # no-torch-runtime.txt drops typer's and pydantic's runtime
-        # deps unless explicitly pinned. Re-install the ones whose
-        # deps don't pull torch.
-        run: |
-          STUDIO_PY=~/.unsloth/studio/unsloth_studio/Scripts/python.exe
-          if [ ! -f "$STUDIO_PY" ]; then
-            echo "::error::Studio venv python not at $STUDIO_PY"
-            ls -la ~/.unsloth/studio/ || true
-            exit 1
-          fi
-          "$STUDIO_PY" -m pip install --upgrade typer pydantic huggingface_hub
-
      - name: Install Playwright + Chromium
        # No --with-deps on Windows: that flag installs Linux apt
        # packages. windows-latest ships the system frameworks
--- a/.github/workflows/studio-windows-update-smoke.yml
+++ b/.github/workflows/studio-windows-update-smoke.yml
@ -176,32 +176,6 @@ jobs:
          fi
          cygpath -w "$SHIM_DIR" >> "$GITHUB_PATH"

-      - name: Patch Studio venv with full typer / pydantic dep trees
-        # install.ps1 runs `uv pip install --no-deps -r
-        # no-torch-runtime.txt` to keep torch out of transitive
-        # resolution from accelerate/peft/trl. That also drops
-        # typer's and pydantic's runtime deps unless they're
-        # explicitly pinned in no-torch-runtime.txt. We pin the
-        # known ones (click, shellingham, annotated-doc, rich,
-        # pydantic-core, annotated-types, typing-inspection, ...)
-        # but typer / pydantic minor versions can introduce new
-        # transitive deps that are NOT in our pin list.
-        #
-        # Belt-and-suspenders: re-install typer + pydantic +
-        # huggingface_hub WITH their deps into the Studio venv.
-        # `pip install --upgrade` only adds missing packages; it
-        # never down-shifts an installed version. Cannot pull
-        # torch (none of typer / pydantic / huggingface_hub depend
-        # on it).
-        run: |
-          STUDIO_PY=~/.unsloth/studio/unsloth_studio/Scripts/python.exe
-          if [ ! -f "$STUDIO_PY" ]; then
-            echo "::error::Studio venv python not at $STUDIO_PY"
-            ls -la ~/.unsloth/studio/ || true
-            exit 1
-          fi
-          "$STUDIO_PY" -m pip install --upgrade typer pydantic huggingface_hub
-
      - name: First update should be a no-op (prebuilt already validated)
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/install.ps1
+++ b/install.ps1
@ -1300,7 +1300,13 @@ shell.Run cmd, 0, False
        if ($SkipTorch) {
            # No-torch: install unsloth + unsloth-zoo with --no-deps, then
            # runtime deps (typer, safetensors, transformers, etc.) with --no-deps.
-            $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython --no-deps --reinstall-package unsloth --reinstall-package unsloth-zoo "unsloth>=2026.5.5" unsloth-zoo }
+            $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython --no-deps --reinstall-package unsloth --reinstall-package unsloth-zoo "unsloth>=2026.5.6" unsloth-zoo }
+            if ($baseInstallExit -eq 0) {
+                # Resolve pydantic WITH deps so pip pins pydantic-core
+                # to the matching version (no-torch-runtime.txt below
+                # is --no-deps). All transitive deps are torch-free.
+                $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython pydantic }
+            }
            if ($baseInstallExit -eq 0) {
                $NoTorchReq = Find-NoTorchRuntimeFile
                if ($NoTorchReq) {
@ -1308,7 +1314,7 @@ shell.Run cmd, 0, False
                }
            }
        } else {
-            $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython --reinstall-package unsloth --reinstall-package unsloth-zoo "unsloth>=2026.5.5" unsloth-zoo }
+            $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython --reinstall-package unsloth --reinstall-package unsloth-zoo "unsloth>=2026.5.6" unsloth-zoo }
        }
        if ($baseInstallExit -ne 0) {
            Write-Host "[ERROR] Failed to install unsloth (exit code $baseInstallExit)" -ForegroundColor Red
@ -1346,7 +1352,11 @@ shell.Run cmd, 0, False
        if ($SkipTorch) {
            # No-torch: install unsloth + unsloth-zoo with --no-deps, then
            # runtime deps (typer, safetensors, transformers, etc.) with --no-deps.
-            $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython --no-deps --upgrade-package unsloth --upgrade-package unsloth-zoo "unsloth>=2026.5.5" unsloth-zoo }
+            $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython --no-deps --upgrade-package unsloth --upgrade-package unsloth-zoo "unsloth>=2026.5.6" unsloth-zoo }
+            if ($baseInstallExit -eq 0) {
+                # Same pydantic-with-deps trick as the migrated branch.
+                $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython pydantic }
+            }
            if ($baseInstallExit -eq 0) {
                $NoTorchReq = Find-NoTorchRuntimeFile
                if ($NoTorchReq) {
@ -1354,7 +1364,7 @@ shell.Run cmd, 0, False
                }
            }
        } elseif ($StudioLocalInstall) {
-            $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython --upgrade-package unsloth "unsloth>=2026.5.5" unsloth-zoo }
+            $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython --upgrade-package unsloth "unsloth>=2026.5.6" unsloth-zoo }
        } else {
            $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython --upgrade-package unsloth -- "$PackageName" }
        }
@ -1382,7 +1392,7 @@ shell.Run cmd, 0, False
        Write-TauriLog "STEP" "Installing unsloth"
        substep "installing unsloth (this may take a few minutes)..."
        if ($StudioLocalInstall) {
-            $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython unsloth-zoo "unsloth>=2026.5.5" --torch-backend=auto }
+            $baseInstallExit = Invoke-InstallCommand { uv pip install --python $VenvPython unsloth-zoo "unsloth>=2026.5.6" --torch-backend=auto }
            if ($baseInstallExit -ne 0) {
                Write-Host "[ERROR] Failed to install unsloth (exit code $baseInstallExit)" -ForegroundColor Red
                return (Exit-InstallFailure "Failed to install unsloth (exit code $baseInstallExit)" $baseInstallExit)
--- a/install.sh
+++ b/install.sh
@ -1865,7 +1865,12 @@ if [ "$_MIGRATED" = true ]; then
        # to prevent transitive torch resolution.
        run_install_cmd "install unsloth (migrated no-torch)" uv pip install --python "$_VENV_PY" --no-deps \
            --reinstall-package unsloth --reinstall-package unsloth-zoo \
-            "unsloth>=2026.5.5" unsloth-zoo
+            "unsloth>=2026.5.6" unsloth-zoo
+        # Resolve pydantic WITH deps so pip pins pydantic-core to the
+        # matching version (no-torch-runtime.txt below is --no-deps).
+        # All transitive deps are torch-free.
+        run_install_cmd "install pydantic (with deps for compatible core)" \
+            uv pip install --python "$_VENV_PY" pydantic
        _NO_TORCH_RT="$(_find_no_torch_runtime)"
        if [ -n "$_NO_TORCH_RT" ]; then
            run_install_cmd "install no-torch runtime deps" uv pip install --python "$_VENV_PY" --no-deps -r "$_NO_TORCH_RT"
@ -1873,7 +1878,7 @@ if [ "$_MIGRATED" = true ]; then
    else
        run_install_cmd "install unsloth (migrated)" uv pip install --python "$_VENV_PY" \
            --reinstall-package unsloth --reinstall-package unsloth-zoo \
-            "unsloth>=2026.5.5" unsloth-zoo
+            "unsloth>=2026.5.6" unsloth-zoo
    fi
    if [ "$STUDIO_LOCAL_INSTALL" = true ]; then
        substep "overlaying local repo (editable)..."
@ -2041,7 +2046,10 @@ elif [ -n "$TORCH_INDEX_URL" ]; then
        # runtime deps (typer, safetensors, transformers, etc.) with --no-deps.
        run_install_cmd "install unsloth (no-torch)" uv pip install --python "$_VENV_PY" --no-deps \
            --upgrade-package unsloth --upgrade-package unsloth-zoo \
-            "unsloth>=2026.5.5" unsloth-zoo
+            "unsloth>=2026.5.6" unsloth-zoo
+        # Same pydantic-with-deps trick as the migrated branch.
+        run_install_cmd "install pydantic (with deps for compatible core)" \
+            uv pip install --python "$_VENV_PY" pydantic
        _NO_TORCH_RT="$(_find_no_torch_runtime)"
        if [ -n "$_NO_TORCH_RT" ]; then
            run_install_cmd "install no-torch runtime deps" uv pip install --python "$_VENV_PY" --no-deps -r "$_NO_TORCH_RT"
@ -2056,7 +2064,7 @@ elif [ -n "$TORCH_INDEX_URL" ]; then
        fi
    elif [ "$STUDIO_LOCAL_INSTALL" = true ]; then
        run_install_cmd "install unsloth (local)" uv pip install --python "$_VENV_PY" \
-            --upgrade-package unsloth "unsloth>=2026.5.5" unsloth-zoo
+            --upgrade-package unsloth "unsloth>=2026.5.6" unsloth-zoo
        substep "overlaying local repo (editable)..."
        run_install_cmd "overlay local repo" uv pip install --python "$_VENV_PY" -e "$_REPO_ROOT" --no-deps
        substep "overlaying unsloth-zoo from git main..."
@ -2088,7 +2096,7 @@ else
    tauri_log "STEP" "Installing Unsloth"
    substep "installing unsloth (this may take a few minutes)..."
    if [ "$STUDIO_LOCAL_INSTALL" = true ]; then
-        run_install_cmd "install unsloth (auto torch backend)" uv pip install --python "$_VENV_PY" unsloth-zoo "unsloth>=2026.5.5" --torch-backend=auto
+        run_install_cmd "install unsloth (auto torch backend)" uv pip install --python "$_VENV_PY" unsloth-zoo "unsloth>=2026.5.6" --torch-backend=auto
        substep "overlaying local repo (editable)..."
        run_install_cmd "overlay local repo" uv pip install --python "$_VENV_PY" -e "$_REPO_ROOT" --no-deps
        substep "overlaying unsloth-zoo from git main..."
--- a/studio/backend/requirements/no-torch-runtime.txt
+++ b/studio/backend/requirements/no-torch-runtime.txt
@ -22,14 +22,11 @@ rich>=13.0
 markdown-it-py>=3.0
 mdurl>=0.1
 pygments>=2.0
-pydantic
-# pydantic 2.x deps. With --no-deps, `import pydantic` blows up
-# with `ModuleNotFoundError: 'pydantic_core'` (compiled Rust core,
-# separate wheel), then `'annotated_types'`, then
-# `'typing_inspection'` (used by pydantic 2.10+ for fields).
-pydantic-core
-annotated-types>=0.6
-typing-inspection>=0.4
+# pydantic is intentionally NOT pinned here. install.sh / install.ps1
+# / install_python_stack.py run `pip install pydantic` WITH deps just
+# before this --no-deps file is applied, so pip resolves pydantic-core
+# to the exact version pydantic's _ensure_pydantic_core_version check
+# expects. Pinning both under --no-deps used to drift them apart.
 pyyaml
 nest-asyncio

--- a/studio/backend/routes/inference.py
+++ b/studio/backend/routes/inference.py
@ -427,9 +427,17 @@ _TOOL_ACTION_NUDGE = (
    " Do NOT output code blocks -- use the python tool instead."
 )

-# Regex for stripping leaked tool-call XML from assistant messages/stream
+# Strip tool-call XML the speculative buffer in core/inference/llama_cpp.py
+# split across the visible/DRAIN boundary. Four leak shapes:
+#   1. well-formed `<tool_call>...</tool_call>` / `<function=...>...</function>`
+#   2. orphan opening to EOF (close was DRAINED)
+#   3. bare orphan close (open was DRAINED)
+#   4. tail-only `</parameter>` (outer close truncated by EOS); anchored to
+#      `\Z` so mid-text `<parameter>` in user code samples survives.
 _TOOL_XML_RE = _re.compile(
-    r"<tool_call>.*?</tool_call>|<function=\w+>.*?</function>",
+    r"<(?:tool_call|function=\w+)>.*?(?:</(?:tool_call|function)>|\Z)"
+    r"|</(?:tool_call|function)>"
+    r"|</parameter>\s*\Z",
    _re.DOTALL,
 )
 logger = get_logger(__name__)
--- a/studio/backend/tests/test_tool_xml_strip.py
+++ b/studio/backend/tests/test_tool_xml_strip.py
@ -0,0 +1,263 @@
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0
+
+"""Tests for `_TOOL_XML_RE` (routes/inference.py) -- strips tool-call
+XML that leaks past the speculative buffer in core/inference/llama_cpp.py
+when the open/close pair is split across the visible/DRAIN boundary.
+"""
+
+from __future__ import annotations
+
+import sys
+import types as _types
+from pathlib import Path
+
+import pytest
+
+_BACKEND_DIR = str(Path(__file__).resolve().parent.parent)
+if _BACKEND_DIR not in sys.path:
+    sys.path.insert(0, _BACKEND_DIR)
+
+# Extract the regex from source (routes module needs heavy stubbing to import).
+import re as _re
+
+_src = (Path(_BACKEND_DIR) / "routes" / "inference.py").read_text()
+_m = _re.search(r"_TOOL_XML_RE = _re\.compile\((.*?)\n\)", _src, _re.DOTALL)
+assert _m, "could not extract _TOOL_XML_RE source"
+_ns = {"_re": _re}
+exec(f"_TOOL_XML_RE = _re.compile({_m.group(1)})", _ns)
+_TOOL_XML_RE = _ns["_TOOL_XML_RE"]
+
+
+# ── Well-formed pairs ─────────────────────────────────────────────
+
+
+def test_strips_well_formed_tool_call():
+    text = (
+        "Let me search.\n"
+        "<tool_call>\n"
+        "<function=web_search>\n"
+        "<parameter=query>\nBillboard 2015\n</parameter>\n"
+        "</function>\n"
+        "</tool_call>\n"
+        "Here are the songs:"
+    )
+    cleaned = _TOOL_XML_RE.sub("", text)
+    assert "<tool_call>" not in cleaned
+    assert "<function=" not in cleaned
+    assert "</tool_call>" not in cleaned
+    assert "</function>" not in cleaned
+    assert "Here are the songs:" in cleaned, "non-XML content must survive"
+    assert "Let me search." in cleaned
+
+
+def test_strips_function_only_well_formed():
+    text = "Setup.\n<function=python>\n<parameter=code>\nprint(1)\n</parameter>\n</function>\nDone."
+    cleaned = _TOOL_XML_RE.sub("", text)
+    assert "<function=" not in cleaned
+    assert "Setup." in cleaned
+    assert "Done." in cleaned
+
+
+# ── Orphan openings ───────────────────────────────────────────────
+
+
+def test_strips_orphan_tool_call_no_close():
+    text = (
+        "Reasoning.\n</think>"
+        "<tool_call>\n"
+        "<function=web_search>\n"
+        "<parameter=query>\nBillboard 2015\n</parameter>\n"
+        "</function"
+    )
+    cleaned = _TOOL_XML_RE.sub("", text)
+    assert "<tool_call>" not in cleaned
+    assert "<function=" not in cleaned
+    assert "Reasoning." in cleaned
+
+
+def test_strips_orphan_function_no_close():
+    text = (
+        "I'll call python:\n<function=python>\n<parameter=code>\nprint(1)\n</parameter>"
+    )
+    cleaned = _TOOL_XML_RE.sub("", text)
+    assert "<function=" not in cleaned
+    assert "I'll call python:" in cleaned
+
+
+def test_strips_orphan_only_opening_tag():
+    cleaned = _TOOL_XML_RE.sub("", "Search starting.\n<tool_call>")
+    assert "<tool_call>" not in cleaned
+    assert "Search starting." in cleaned
+
+
+def test_strips_multiple_orphans():
+    text = (
+        "First call:\n<tool_call>\n<function=python>\n<parameter=code>\nx=1\n"
+        "Second call:\n<function=web_search>\n<parameter=query>\nhi\n"
+    )
+    cleaned = _TOOL_XML_RE.sub("", text)
+    assert "<tool_call>" not in cleaned
+    assert "<function=" not in cleaned
+
+
+# ── Orphan closes ─────────────────────────────────────────────────
+
+
+def test_strips_orphan_closing_tag():
+    # Real shape from Qwen3.6-27B Q8 sweep (open got DRAINED, close leaked).
+    text = "...the table rows directly.\n</parameter>\n</function>\n</tool_call><think>Continuing</think>"
+    cleaned = _TOOL_XML_RE.sub("", text)
+    assert "</tool_call>" not in cleaned
+    assert "</function>" not in cleaned
+    # Mid-string </parameter> intentionally preserved (see preserve test).
+
+
+# ── Tail-only </parameter> (PR #5735 follow-up) ───────────────────
+
+
+def test_strips_tail_only_parameter_orphan():
+    # Outer </function></tool_call> truncated by EOS, inner <parameter=...> DRAINED.
+    cleaned = _TOOL_XML_RE.sub("", "and the text is not readable.\n</parameter>\n\n")
+    assert "</parameter>" not in cleaned
+    assert "and the text is not readable." in cleaned
+
+
+def test_strips_tail_only_parameter_orphan_single_newline():
+    cleaned = _TOOL_XML_RE.sub("", "Global Economic Prospects\n</parameter>\n")
+    assert "</parameter>" not in cleaned
+    assert "Global Economic Prospects" in cleaned
+
+
+def test_strips_tail_only_parameter_orphan_no_trailing_ws():
+    cleaned = _TOOL_XML_RE.sub("", "Final answer.</parameter>")
+    assert "</parameter>" not in cleaned
+    assert "Final answer." in cleaned
+
+
+def test_preserves_mid_string_parameter_in_code_sample():
+    # Tail-anchor on `</parameter>` is required so doc/example prose survives.
+    text = (
+        "Here is the Qwen tool-call format:\n"
+        "```xml\n"
+        "<tool_call><function=foo><parameter=arg>value</parameter></function></tool_call>\n"
+        "```\n"
+        "Note the closing </parameter> sits inside <function>."
+    )
+    cleaned = _TOOL_XML_RE.sub("", text)
+    assert "Note the closing </parameter> sits inside" in cleaned
+
+
+def test_strips_well_formed_then_orphan():
+    text = (
+        "Round one:\n<tool_call>\n<function=python>\n<parameter=code>\n1\n"
+        "</parameter>\n</function>\n</tool_call>\n"
+        "Now round two:\n<tool_call>\n<function=web_search>\n<parameter=query>\n"
+        "what is X\n</parameter>\n</function"
+    )
+    cleaned = _TOOL_XML_RE.sub("", text)
+    assert "<tool_call>" not in cleaned
+    assert "<function=" not in cleaned
+    assert "Round one:" in cleaned
+    assert "Now round two:" in cleaned
+
+
+# ── Preservation (no false positives) ────────────────────────────
+
+
+def test_preserves_plain_text():
+    text = "1. Animals — Maroon 5\n2. Take Me to Church — Hozier"
+    assert _TOOL_XML_RE.sub("", text) == text
+
+
+def test_preserves_code_fences():
+    text = "```python\nimport sys\nprint(sys.version)\n```"
+    assert _TOOL_XML_RE.sub("", text) == text
+
+
+def test_preserves_html_in_prose():
+    text = "Use the <html> tag for documents."
+    assert _TOOL_XML_RE.sub("", text) == text
+
+
+# ── Real-world leak samples from the 2026-05-22 sweep ────────────
+
+
+REAL_LEAKS = [
+    # Qwen3.5-35B-A3B UD-Q4_K_XL billboard s22 -- orphan open
+    'rectly.\n\nLet me try searching for Wikipedia pages that might have weekly chart data for 2015.\n</think><tool_call>\n<function=web_search>\n<parameter=query>\n"Billboard Hot 100" "2015" "weekly" "chart" "position" "3"\n</parameter>\n</function',
+    # Qwen3.6-27B UD-Q2_K_XL billboard s14 -- orphan open
+    'arch `site:wikipedia.org "peaked at number 3" "2015" Billboard`\nI\'ll do a quick web search.\n</think><tool_call>\n<function=web_search>\n<parameter=query>\n"peaked at number 3" Billboard Hot 100 2015 list\n</parameter>\n</function',
+    # Qwen3.6-27B UD-Q2_K_XL billboard s15 -- orphan open
+    'rd Hot 100 top-ten singles in 2015".\nI\'ll use web_search to find this exact Wikipedia page.\n</think><tool_call>\n<function=web_search>\n<parameter=query>\n"List of Billboard Hot 100 top-ten singles in 2015" wikipedia\n</parameter>\n</function',
+    # Qwen3.6-27B Q8_0 billboard s02 -- orphan close
+    "the table rows directly.\n</parameter>\n</function>\n</tool_call><think>The user wants me to list and categorize all songs that charted #3 on the Billboard Hot 100 in 2015. I have been trying to get this data",
+    # Qwen3.6-35B-A3B Q8_0 billboard s21 -- orphan close
+    "parse it more carefully.\n</parameter>\n</function>\n</tool_call><think>The user wants a list of songs that charted #3 on the Billboard Hot 100 in 2015, categorized.",
+]
+
+
+@pytest.mark.parametrize(
+    "leak", REAL_LEAKS, ids = [f"sweep_sample_{i}" for i in range(len(REAL_LEAKS))]
+)
+def test_real_world_sweep_leaks_get_stripped(leak):
+    cleaned = _TOOL_XML_RE.sub("", leak)
+    assert "<tool_call>" not in cleaned, f"leak survived: {cleaned!r}"
+    assert "<function=" not in cleaned, f"leak survived: {cleaned!r}"
+
+
+# ── Real-world tail-only </parameter> from gdpval sweep ──────────
+
+
+# All end-anchored: outer </function></tool_call> truncated by EOS,
+# inner <parameter=...> open DRAINED, leaving bare </parameter> tail.
+GDPVAL_PARAMETER_LEAKS = [
+    # Qwen3.5-27B Q8_0 / worldbank s00
+    "the page contains image data and the text is not readable.\n</parameter>\n\n",
+    # Qwen3.5-27B Q8_0 / worldbank s42 (preceded by mojibake)
+    "...some mojibake content here...\n</parameter>\n\n",
+    # Qwen3.5-27B UD-Q4_K_XL / coppa s07
+    "blocked, while others may still be in effect. The law is currently under further review by the Ninth Circuit.\n</parameter>\n\n",
+    # Qwen3.5-27B UD-Q4_K_XL / police_training s00
+    "comprehensive training report\n</parameter>\n\n",
+    # Qwen3.5-27B UD-Q4_K_XL / worldbank s00
+    "Global Economic Prospects\nJune 2025\nGlobal Economic Prospects\n</parameter>\n",
+    # Qwen3.6-27B Q8_0 / overpass s07
+    "Let me create a comprehensive query and instructions document.\n</parameter>\n\n",
+]
+
+
+@pytest.mark.parametrize(
+    "leak",
+    GDPVAL_PARAMETER_LEAKS,
+    ids = [f"gdpval_param_orphan_{i}" for i in range(len(GDPVAL_PARAMETER_LEAKS))],
+)
+def test_gdpval_parameter_orphans_get_stripped(leak):
+    cleaned = _TOOL_XML_RE.sub("", leak)
+    assert "</parameter>" not in cleaned, f"leak survived: {cleaned!r}"
+
+
+# ── Backtracking guards ──────────────────────────────────────────
+
+
+def test_no_catastrophic_backtracking_on_open_bracket_spam():
+    # 256KB of '<' must fail fast (literal mismatch char 2), not backtrack.
+    import time
+
+    adv = "<" * (1024 * 256) + "X"
+    t0 = time.perf_counter()
+    _TOOL_XML_RE.sub("", adv)
+    elapsed = time.perf_counter() - t0
+    assert elapsed < 0.5, f"regex took {elapsed*1000:.0f}ms on 256KB '<' spam"
+
+
+def test_no_catastrophic_backtracking_on_orphan_opening_spam():
+    # 1000 unclosed openings: first alt must consume them all greedily.
+    import time
+
+    adv = "<tool_call>X" * 1000
+    t0 = time.perf_counter()
+    cleaned = _TOOL_XML_RE.sub("", adv)
+    elapsed = time.perf_counter() - t0
+    assert elapsed < 0.1, f"regex took {elapsed*1000:.0f}ms on 1000x orphan opens"
+    assert "<tool_call>" not in cleaned
--- a/studio/frontend/src/features/auth/components/auth-form.tsx
+++ b/studio/frontend/src/features/auth/components/auth-form.tsx
@ -194,7 +194,10 @@ export function AuthForm({ mode }: AuthFormProps): ReactElement | null {
  const hasBootstrapPassword = Boolean(window.__UNSLOTH_BOOTSTRAP__?.password);
  const invalidChangePasswordForm =
    !isLoginMode &&
-    (newPassword.length < 8 || newPassword !== confirmPassword || currentPassword === newPassword);
+    (currentPassword.length < 8 ||
+      newPassword.length < 8 ||
+      newPassword !== confirmPassword ||
+      currentPassword === newPassword);
  const showPasswordMismatchWarning =
    !isLoginMode &&
    newPassword.length > 0 &&
@ -206,8 +209,13 @@ export function AuthForm({ mode }: AuthFormProps): ReactElement | null {
    setError(null);

    if (!isLoginMode) {
-      if (!currentPassword) {
-        setError("Unable to initialize setup. Reload the page and try again.");
+      // Mirror the disable gate: Enter / autofill can bypass the button.
+      if (currentPassword.length < 8) {
+        setError(
+          currentPassword
+            ? "Current password must be at least 8 characters."
+            : "Unable to initialize setup. Reload the page and try again.",
+        );
        return;
      }
      if (newPassword.length < 8) {
--- a/studio/install_llama_prebuilt.py
+++ b/studio/install_llama_prebuilt.py
@ -3827,24 +3827,18 @@ def paired_runtime_dll_patterns(choice: AssetChoice) -> list[str]:


 def runtime_patterns_for_choice(choice: AssetChoice) -> list[str]:
+    # Broad shared-library glob + explicit binary names. Lets upstream
+    # repackage the SO/DLL set (e.g. ggml-org/llama.cpp#23462 split the
+    # per-binary entry code into paired ``lib<binary>-impl.so`` shared
+    # libraries between b9279 and b9283) without us re-enumerating
+    # every new file. Studio only invokes llama-server and llama-quantize;
+    # other CLIs upstream ships (llama-cli, llama-bench, ...) are skipped.
    if choice.install_kind in {"linux-cpu", "linux-cuda", "linux-rocm"}:
-        return [
-            "llama-server",
-            "llama-quantize",
-            "libllama-common.so*",
-            "libllama.so*",
-            "libggml.so*",
-            "libggml-base.so*",
-            "libmtmd.so*",
-            "libggml-cpu-*.so*",
-            "libggml-cuda.so*",
-            "libggml-hip.so*",
-            "libggml-rpc.so*",
-        ]
+        return ["llama-server", "llama-quantize", "lib*.so*"]
    if choice.install_kind in {"macos-arm64", "macos-x64"}:
        return ["llama-server", "llama-quantize", "lib*.dylib"]
    if choice.install_kind in {"windows-cpu", "windows-cuda", "windows-hip"}:
-        return ["*.exe", "*.dll"]
+        return ["llama-server.exe", "llama-quantize.exe", "*.dll"]
    raise PrebuiltFallback(
        f"unsupported install kind for runtime overlay: {choice.install_kind}"
    )
--- a/studio/install_python_stack.py
+++ b/studio/install_python_stack.py
@ -979,6 +979,16 @@ def install_python_stack() -> int:
            package_name,
            "unsloth-zoo",
        )
+        # Resolve pydantic WITH deps so pip pins pydantic-core to the
+        # exact version pydantic's metadata declares. Under --no-deps
+        # alone pip picks the latest of each and trips pydantic's
+        # _ensure_pydantic_core_version check. Transitive deps are
+        # torch-free.
+        pip_install(
+            "Installing pydantic (with deps for compatible core)",
+            "--no-cache-dir",
+            "pydantic",
+        )
        pip_install(
            "Installing no-torch runtime deps",
            "--no-cache-dir",
--- a/tests/studio/install/test_rocm_support.py
+++ b/tests/studio/install/test_rocm_support.py
@ -346,20 +346,26 @@ class TestRuntimePatterns:
        patterns = runtime_patterns_for_choice(choice)
        assert "llama-server" in patterns
        assert "llama-quantize" in patterns
+        # Broad lib*.so* covers libllama, libggml, libmtmd, libggml-cpu-*,
+        # plus the libllama-<binary>-impl.so split that ggml-org/llama.cpp
+        # #23462 introduced between b9279 and b9283.
+        assert "lib*.so*" in patterns

    def test_linux_cuda_patterns(self):
        choice = AssetChoice(
            repo = "", tag = "", name = "", url = "", source_label = "", install_kind = "linux-cuda"
        )
        patterns = runtime_patterns_for_choice(choice)
-        assert "libggml-cuda.so*" in patterns
+        # libggml-cuda.so is matched by lib*.so* now.
+        assert "lib*.so*" in patterns

    def test_linux_rocm_patterns(self):
        choice = AssetChoice(
            repo = "", tag = "", name = "", url = "", source_label = "", install_kind = "linux-rocm"
        )
        patterns = runtime_patterns_for_choice(choice)
-        assert "libggml-hip.so*" in patterns
+        # libggml-hip.so is matched by lib*.so* now.
+        assert "lib*.so*" in patterns
        assert "llama-server" in patterns

    def test_windows_hip_patterns(self):
@ -372,7 +378,10 @@ class TestRuntimePatterns:
            install_kind = "windows-hip",
        )
        patterns = runtime_patterns_for_choice(choice)
-        assert "*.exe" in patterns
+        # Narrowed from "*.exe" to the two binaries Studio actually
+        # invokes, mirroring the Linux/macOS pattern style.
+        assert "llama-server.exe" in patterns
+        assert "llama-quantize.exe" in patterns
        assert "*.dll" in patterns

    def test_macos_patterns(self):
--- a/unsloth/models/_utils.py
+++ b/unsloth/models/_utils.py
@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-__version__ = "2026.5.6"
+__version__ = "2026.5.7"

 __all__ = [
    "SUPPORTS_BFLOAT16",
--- a/unsloth/models/rl.py
+++ b/unsloth/models/rl.py
@ -1312,7 +1312,9 @@ def _patch_trl_rl_trainers_impl(trainer_file = "grpo_trainer"):
        "logging_nan_inf_filter": False,
        "per_device_train_batch_size": 4,
        "gradient_accumulation_steps": 2,
-        "weight_decay": 0.01,
+        # LoRA decays A and B toward 0 so effective W = W_init + (alpha/r) * B @ A is pulled toward W_init, not 0 as in full FT.
+        # 0.001 keeps a small Frobenius prior |A|_F^2 + |B|_F^2 without measurably dragging the merged adapter back to base.
+        "weight_decay": 0.001,
        "seed": 3407,
        "optim": "adamw_8bit",
        "learning_rate": 5e-05,