Resolve merge conflicts between feat/user_feedback and origin/main

- Merged enhanced_responses imports in server.py to include both JudgeResponse and Plan-related types
- Combined templated macros with technical_decisions section in judge_coding_plan.md
- Adopted origin/main version of workflow_guidance.py for better task size-based routing
- Updated uv.lock to version 0.3.20 and removed revision field

Author: mcp-release-bot

.github/workflows/prepare-release.yml

@@ -52,7 +52,7 @@ jobs:
       - name: Create GitHub App token
         if: env.ACT != 'true'
         id: app_token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@v2
         with:
           app-id: ${{ secrets.APP_ID }}
           private-key: ${{ secrets.APP_PRIVATE_KEY }}

.github/workflows/release-e2e.yml

@@ -54,7 +54,7 @@ jobs:
 
       - name: Create GitHub App token
         id: app_token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@v2
         with:
           app-id: ${{ secrets.APP_ID }}
           private-key: ${{ secrets.APP_PRIVATE_KEY }}

.github/workflows/release.yml

@@ -54,7 +54,7 @@ jobs:
       contents: read
       id-token: write
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: dist
           path: dist
@@ -118,7 +118,7 @@ jobs:
           echo "## What's Changed" > CHANGELOG.md
           echo "" >> CHANGELOG.md
           git log --oneline --pretty=format:"* %s" $(git describe --tags --abbrev=0 HEAD^)..HEAD >> CHANGELOG.md || echo "* Initial release" >> CHANGELOG.md
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: dist
           path: dist
@@ -138,78 +138,44 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v5
-      - name: Install MCP Publisher CLI
-        run: |
-          curl -L "https://github.com/modelcontextprotocol/registry/releases/download/v1.0.0/mcp-publisher_1.0.0_$(uname -s | tr '[:upper:]' '[:lower:]')_$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/').tar.gz" | tar xz mcp-publisher
       - name: Extract version from tag
         id: ver
         run: |
           echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-      - name: Generate server.json
-        id: server
+      - name: Extract project metadata
+        id: metadata
         env:
           VERSION: ${{ steps.ver.outputs.VERSION }}
         run: |
           python - <<'PY'
-          import json, tomllib, os
+          import tomllib, os
           VERSION = os.environ['VERSION']
           with open('pyproject.toml','rb') as f:
               data = tomllib.load(f)
           project = data['project']
-          server = {
-              "name": f"io.github.OtherVibes/{project['name']}",
-              "description": project['description'],
-              "version": VERSION,
-              "homepage": next((url[1] for url in project.get('urls', {}).items() if url[0] == 'Homepage'), ''),
-              "license": project.get('license', {}).get('text', 'MIT'),
-              "runtime": {
-                  "type": "uv",
-                  "package": f"{project['name']}=={VERSION}",
-                  "transport": {"type": "stdio"}
-              }
-          }
-          with open('server.json', 'w') as f:
-              json.dump(server, f, indent=2)
+
+          # Extract metadata for the action
+          name = f"io.github.OtherVibes/{project['name']}"
+          description = project['description']
+          homepage = next((url[1] for url in project.get('urls', {}).items() if url[0] == 'Homepage'), '')
+          package_name = project['name']
+
+          # Write to GitHub outputs
           with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
-              f.write(f"json={json.dumps(server)}\n")
+              f.write(f"name={name}\n")
+              f.write(f"description={description}\n")
+              f.write(f"homepage={homepage}\n")
+              f.write(f"package_name={package_name}\n")
           PY
-      - name: Login to MCP Registry (GitHub OIDC)
-        run: |
-          ./mcp-publisher login github-oidc
       - name: Publish to MCP Registry
-        env:
-          NAME: ${{ fromJSON(steps.server.outputs.json).name }}
-        run: |
-          ./mcp-publisher publish server.json
-      - name: Verify publication
-        env:
-          NAME: ${{ fromJSON(steps.server.outputs.json).name }}
-          VERSION: ${{ fromJSON(steps.server.outputs.json).version }}
-        run: |
-          echo "✅ Publication command completed successfully"
-          echo "📋 Published server: $NAME version $VERSION"
-
-          echo "🔍 Verifying publication in registry..."
-
-          # Use search parameter to find our server (includes all versions)
-          server_name_only=$(echo "$NAME" | sed 's/.*\///')
-          curl -s "https://registry.modelcontextprotocol.io/v0/servers?search=$server_name_only" > search_results.json
-
-          # Check if our specific version exists
-          version_found=$(jq -r --arg name "$NAME" --arg version "$VERSION" '.servers[] | select(.name == $name and .version == $version) | .version' search_results.json)
-
-          if [ -n "$version_found" ]; then
-            echo "✅ Server $NAME version $VERSION is published in MCP Registry!"
-            echo "📋 Server details:"
-            jq -r --arg name "$NAME" --arg version "$VERSION" '.servers[] | select(.name == $name and .version == $version) | {name, version, description, is_latest: ._meta."io.modelcontextprotocol.registry/official".is_latest}' search_results.json
-
-            # Show all versions of this server
-            echo ""
-            echo "� All published versions:"
-            jq -r --arg name "$NAME" '.servers[] | select(.name == $name) | "  - v" + .version + " (latest: " + (._meta."io.modelcontextprotocol.registry/official".is_latest | tostring) + ")"' search_results.json | sort -V
-          else
-            echo "❌ Server $NAME version $VERSION not found in registry"
-            echo "🔍 Available versions for this server:"
-            jq -r --arg name "$NAME" '.servers[] | select(.name == $name) | "  - v" + .version' search_results.json | sort -V
-            exit 1
-          fi
+        uses: OtherVibes/mcp-publish-action@v1
+        with:
+          name: ${{ steps.metadata.outputs.name }}
+          description: ${{ steps.metadata.outputs.description }}
+          version: ${{ steps.ver.outputs.VERSION }}
+          website_url: ${{ steps.metadata.outputs.homepage }}
+          registry_type: pypi
+          identifier: ${{ steps.metadata.outputs.package_name }}
+          package_version: ${{ steps.ver.outputs.VERSION }}
+          transport_type: stdio
+          verify: true

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcp-as-a-judge"
-version = "0.3.14"
+version = "0.3.20"
 description = "MCP as a Judge: a behavioral MCP that strengthens AI coding assistants via explicit LLM evaluations"
 readme = "README.md"
 license = { text = "MIT" }
@@ -62,6 +62,7 @@ dev-dependencies = [
     "types-requests>=2.31.0",
     "pre-commit>=3.0.0",
     "bandit>=1.8.6",
+    "jinja2>=3.1.6",
 ]
 
 [tool.hatch.envs.default]

scripts/bump_version.py

@@ -17,6 +17,7 @@
   - Prints a machine-readable list of other files containing the old version preceded by 'FOUND: '
   - Exits non-zero on validation failure or if expected files are missing
 """
+
 from __future__ import annotations
 
 import argparse
@@ -49,7 +50,9 @@ def extract_current_version() -> str:
     # naive toml line parse to avoid adding deps
     m = re.search(r'^version\s*=\s*"([^"]+)"', text, re.MULTILINE)
     if not m:
-        print("ERROR: Could not find [project].version in pyproject.toml", file=sys.stderr)
+        print(
+            "ERROR: Could not find [project].version in pyproject.toml", file=sys.stderr
+        )
         sys.exit(2)
     return m.group(1)
 
@@ -90,15 +93,32 @@ def bump_init(version: str) -> bool:
 
 def find_other_references(old_version: str) -> None:
     # Report-only scan for the old version string across repo (excluding venvs, git, dist, etc.)
-    skip_dirs = {".git", ".venv", "dist", "build", "__pycache__", ".mypy_cache", ".ruff_cache"}
+    skip_dirs = {
+        ".git",
+        ".venv",
+        "dist",
+        "build",
+        "__pycache__",
+        ".mypy_cache",
+        ".ruff_cache",
+    }
     for path in REPO_ROOT.rglob("*"):
         if path.is_dir():
             if path.name in skip_dirs:
                 # prune by skipping children
                 for _ in []:
                     pass
             continue
-        if path.suffix in {".png", ".jpg", ".jpeg", ".gif", ".zip", ".whl", ".tar", ".gz"}:
+        if path.suffix in {
+            ".png",
+            ".jpg",
+            ".jpeg",
+            ".gif",
+            ".zip",
+            ".whl",
+            ".tar",
+            ".gz",
+        }:
             continue
         # Avoid scanning the lock file for noisy matches
         if path.name == "uv.lock":
@@ -113,7 +133,9 @@ def find_other_references(old_version: str) -> None:
 
 def main() -> None:
     parser = argparse.ArgumentParser(description="Bump project version across files")
-    parser.add_argument("--version", required=True, help="Semantic version, e.g., 0.3.0")
+    parser.add_argument(
+        "--version", required=True, help="Semantic version, e.g., 0.3.0"
+    )
     args = parser.parse_args()
 
     new_version = args.version.strip()
@@ -146,4 +168,3 @@ def main() -> None:
 
 if __name__ == "__main__":
     main()
-

src/mcp_as_a_judge/__init__.py

@@ -5,7 +5,7 @@
 against software engineering best practices.
 """
 
-__version__ = "0.3.14"
+__version__ = "0.3.20"
 
 
 # Lazy imports to avoid dependency issues in Cloudflare Workers