Merge branch 'bugfix/admin-edit-prompt-json-500' of github.com:IBM/mcp-context-forge into bugfix/admin-edit-prompt-json-500

Author: Suresh Kumar Moharajan

.github/CODEOWNERS

@@ -1,5 +1,11 @@
 # All files in the repo
 * @crivetimihai
 
+# Plugin framework
+/mcpgateway/plugins @araujof @terylt @jonpspri
+
 # Ownership for all tests
 /tests/ @crivetimihai @kevalmahajan @madhav165
+
+# Tests for plugin framework
+/tests/unit/mcpgateway/plugins @araujof @terylt @jonpspri

.github/workflows/license-check.yml

@@ -48,7 +48,8 @@ jobs:
       - name: Install go-licenses
         run: go install github.com/google/go-licenses@latest
 
-      - uses: dtolnay/rust-toolchain@stable
+      - name: Install Rust stable
+        run: rustup default stable
 
       - name: Install cargo-license
         run: cargo install cargo-license

.github/workflows/pytest.yml

@@ -83,6 +83,26 @@ jobs:
           version: "0.9.2"
           python-version: ${{ matrix.python }}
 
+      # -----------------------------------------------------------
+      # 2.5  Setup Rust toolchain for Rust plugins
+      # -----------------------------------------------------------
+      - name: 🦀  Install Rust stable
+        run: rustup default stable
+
+      - name: 📦  Cache Cargo dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            plugins_rust/*/target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
+
+      - name: 🔨  Build Rust plugins (clean, install, verify stubs)
+        run: make rust-clean-stubs && make rust-install && make rust-verify-stubs
+
       # -----------------------------------------------------------
       # 3️⃣  Run the tests with coverage (fail under 95% coverage)
       # -----------------------------------------------------------
@@ -98,6 +118,8 @@ jobs:
             --cov-report=term \
             --cov-branch \
             --cov-fail-under=95
+        env:
+          REQUIRE_RUST: "1"
 
       # -----------------------------------------------------------
       # 3.5  Diff-cover: enforce 95% coverage on changed lines (PRs only)

.github/workflows/rust-plugins.yml

@@ -24,7 +24,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # Rust unit tests and linting
+  # Rust unit tests and linting (all plugins in one job per OS)
   rust-tests:
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
     name: Rust Tests (${{ matrix.os }})
@@ -34,7 +34,6 @@ jobs:
       fail-fast: false
       matrix:
         os: ${{ github.event_name == 'pull_request' && fromJSON('["ubuntu-latest"]') || fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]') }}
-        rust: [stable]
 
     steps:
       - uses: actions/checkout@v4
@@ -60,26 +59,17 @@ jobs:
       - name: Cache Cargo build
         uses: actions/cache@v4
         with:
-          path: plugins_rust/target
+          path: plugins_rust/*/target
           key: ${{ runner.os }}-cargo-build-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Check formatting
-        working-directory: plugins_rust
-        run: make fmt-check
+      # rust-check = fmt-check + clippy + cargo test only
+      - name: Run all checks for plugins
+        run: make rust-check
 
-      - name: Run Clippy
-        working-directory: plugins_rust
-        run: make clippy
-
-      - name: Run Rust tests
-        working-directory: plugins_rust
-        run: make test-verbose
-
-
-  # Build wheels for multiple platforms (native builds)
+  # Build wheels for multiple platforms (all plugins in one job per OS)
   build-wheels:
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
-    name: Build wheels on ${{ matrix.os }}
+    name: Build wheels (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     strategy:
@@ -98,75 +88,46 @@ jobs:
       - name: Install Rust stable
         run: rustup default stable
 
-      - name: Install maturin
-        run: pip install maturin
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          version: "0.9.2"
+
+      - name: Install maturin as CLI tool
+        run: uv tool install maturin
 
-      - name: Build wheels
-        working-directory: plugins_rust
-        run: maturin build --release --out dist
+      - name: Build wheels for all plugins
+        run: make rust-build-wheels
 
       - name: Upload wheels as artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.os }}
-          path: plugins_rust/dist/*.whl
+          name: wheels-build
+          path: plugins_rust/*/dist/*.whl
 
-
-  # Python integration tests with Rust extensions
-  python-integration:
+  # Security audit (all plugins in one job)
+  security-audit:
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
-    name: Python Integration Tests (${{ matrix.os }}, Python ${{ matrix.python-version }})
-    runs-on: ${{ matrix.os }}
+    name: Security Audit
+    runs-on: ubuntu-latest
     timeout-minutes: 60
-    needs: build-wheels
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ${{ github.event_name == 'pull_request' && fromJSON('["ubuntu-latest"]') || fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]') }}
-        python-version: ["3.12"]
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Install Rust stable
         run: rustup default stable
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-        with:
-          version: "0.9.2"
-
-      - name: Install maturin as CLI tool
-        run: uv tool install maturin
-
-      - name: Create virtual environment
-        run: uv venv
-
-      - name: Install dependencies
-        run: |
-          uv pip install pytest pytest-cov pydantic
-
-      - name: Build and install Rust extension
-        working-directory: plugins_rust
-        run: make dev
-
-      - name: Run Python unit tests (Rust)
-        working-directory: plugins_rust
-        run: uv run make test-python
+      - name: Install cargo-audit
+        run: cargo install cargo-audit
 
-      - name: Run differential tests
-        working-directory: plugins_rust
-        run: uv run make test-differential
+      - name: Run security audit on all plugins
+        run: make rust-audit
 
-  # Security audit
-  security-audit:
+  # Benchmark tests (verify benchmarks compile and run)
+  benchmark-tests:
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
-    name: Security Audit
+    name: Benchmark Tests
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
@@ -176,14 +137,28 @@ jobs:
       - name: Install Rust stable
         run: rustup default stable
 
-      - name: Install cargo-audit
-        run: cargo install cargo-audit
+      - name: Cache Cargo registry
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache Cargo index
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache Cargo build
+        uses: actions/cache@v4
+        with:
+          path: plugins_rust/*/target
+          key: ${{ runner.os }}-cargo-bench-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Run security audit
-        working-directory: plugins_rust
-        run: make audit
+      - name: Run benchmarks for all plugins
+        run: make rust-bench
 
-  # Coverage report
+  # Coverage report (all plugins in one job)
   coverage:
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
     name: Code Coverage
@@ -217,24 +192,19 @@ jobs:
       - name: Install coverage tools
         run: |
           uv pip install pytest pytest-cov pydantic
-          cargo install cargo-tarpaulin
+          cargo install cargo-llvm-cov
 
-      - name: Build Rust extension
-        working-directory: plugins_rust
-        run: make dev
-
-      - name: Run coverage
-        working-directory: plugins_rust
-        run: uv run make coverage
+      - name: Run coverage for all plugins
+        run: make rust-coverage
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4
         with:
-          files: ./plugins_rust/coverage/cobertura.xml
-          flags: rust
-          name: rust-coverage
+          files: ./plugins_rust/*/coverage/cobertura.xml
+          flags: rust-plugins
+          name: rust-plugins-coverage
 
-  # Build documentation
+  # Build documentation (all plugins in one job)
   documentation:
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
     name: Build Documentation
@@ -247,24 +217,24 @@ jobs:
       - name: Install Rust stable
         run: rustup default stable
 
-      - name: Build Rust docs
-        working-directory: plugins_rust
-        run: make doc
+      - name: Build Rust docs for all plugins
+        run: make rust-doc
 
       - name: Upload documentation
         uses: actions/upload-artifact@v4
         with:
           name: rust-docs
-          path: plugins_rust/target/doc
+          path: plugins_rust/*/target/doc
 
-  # Release build (only on tags)
+  # Release build (only on tags, all plugins per OS)
   release:
-    name: Release Build
+    name: Release Build (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     if: startsWith(github.ref, 'refs/tags/')
-    needs: [rust-tests, python-integration]
+    needs: rust-tests
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
 
@@ -279,22 +249,25 @@ jobs:
       - name: Install Rust stable
         run: rustup default stable
 
-      - name: Install maturin
-        run: pip install maturin
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          version: "0.9.2"
+
+      - name: Install maturin as CLI tool
+        run: uv tool install maturin
 
-      - name: Build release wheels
-        working-directory: plugins_rust
-        run: maturin build --release --out dist
+      - name: Build and publish release wheels
+        env:
+          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+        run: |
+          make rust-release
+          if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
+            make rust-release-publish
+          fi
 
       - name: Upload release artifacts
         uses: actions/upload-artifact@v4
         with:
           name: release-wheels-${{ matrix.os }}
-          path: plugins_rust/dist/*.whl
-
-      - name: Publish to PyPI (if tag)
-        if: startsWith(github.ref, 'refs/tags/')
-        env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
-        working-directory: plugins_rust
-        run: maturin publish --username __token__ --password $MATURIN_PYPI_TOKEN
+          path: plugins_rust/*/dist/*.whl

.gitignore

@@ -258,6 +258,7 @@ uv.lock
 # Rust (plugins_rust)
 # ========================================
 plugins_rust/target/
+plugins_rust/*/target/
 *.rs.bk
 plugins_rust/Cargo.lock
 

.pre-commit-config.yaml

@@ -305,8 +305,8 @@ repos:
         types: [xml]
 
       - id: fix-byte-order-marker
-        name: ✅ Fix Byte Order Marker
-        description: Removes UTF-8 byte-order marker.
+        name: ✅ Check Byte Order Marker
+        description: Forbids files which have a UTF-8 byte-order marker.
         types: [text]
 
   - repo: https://github.com/adrienverge/yamllint

.pre-commit-lite.yaml

@@ -309,8 +309,8 @@ repos:
         types: [xml]
 
       - id: fix-byte-order-marker
-        name: ✅ Fix Byte Order Marker
-        description: Removes UTF-8 byte-order marker.
+        name: ✅ Check Byte Order Marker
+        description: Forbids files which have a UTF-8 byte-order marker.
         types: [text]
 
   - repo: https://github.com/adrienverge/yamllint