Merge remote-tracking branch 'origin/main' into remote-mcp-servers

Author: amirejaz

.github/workflows/build-and-publish.yml

@@ -63,13 +63,17 @@ jobs:
           name: codecov-umbrella
         continue-on-error: true
 
-      - name: Build tools
+      - name: Install Task
+        uses: arduino/setup-task@v2
+
+      - name: Validate schema file syntax
         run: |
-          go build -o registry-builder ./cmd/registry-builder
-          go build -o import-from-toolhive ./cmd/import-from-toolhive
+          echo "Validating schema JSON syntax..."
+          jq empty schemas/registry.schema.json
+          echo "✅ Schema file is valid JSON"
 
       - name: Validate registry entries
-        run: ./registry-builder validate -v
+        run: task validate
 
   build-and-release:
     name: Build and Release Registry
@@ -88,13 +92,13 @@ jobs:
           go-version-file: 'go.mod'
           cache: true
 
-      - name: Build registry-builder
-        run: go build -o registry-builder ./cmd/registry-builder
+      - name: Install Task
+        uses: arduino/setup-task@v2
 
       - name: Build registry files (both formats)
         run: |
           mkdir -p dist
-          ./registry-builder build --format all -v
+          task build:registry
           cp build/registry.json dist/registry.json
           cp build/official-registry.json dist/official-registry.json
           CONTAINER_COUNT=$(jq '.servers | length' dist/registry.json)

.github/workflows/update-tools.yml

@@ -184,34 +184,32 @@ jobs:
             fi
           fi
 
-      - name: Commit changes
+      - name: Stage changes for later commit
         if: (steps.update.outputs.changed == 'true' || steps.update.outputs.warning-added == 'true') && github.event_name == 'pull_request'
         run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "GitHub Action"
+          # Just stage the files, don't commit yet
+          git add "${{ matrix.spec }}"
           
+          # Create a summary file for the commit job to use
           SERVER_NAME="${{ steps.server-info.outputs.server-name }}"
+          mkdir -p /tmp/commit-info
           
           if [ "${{ steps.update.outputs.changed }}" = "true" ]; then
-            git add "${{ matrix.spec }}"
-            git commit -m "chore: update tool list for $SERVER_NAME
-
-          Automatically updated tool list using 'thv mcp list --server $SERVER_NAME'
-          
-          Co-authored-by: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
+            echo "update" > "/tmp/commit-info/${SERVER_NAME}.type"
+            echo "$SERVER_NAME" > "/tmp/commit-info/${SERVER_NAME}.name"
+            echo "${{ matrix.spec }}" > "/tmp/commit-info/${SERVER_NAME}.spec"
           else
-            git add "${{ matrix.spec }}"
-            git commit -m "chore: add warning for $SERVER_NAME tool list update failure
-
-          Could not fetch tools from MCP server, added warning comment.
-          
-          Co-authored-by: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
+            echo "warning" > "/tmp/commit-info/${SERVER_NAME}.type"
+            echo "$SERVER_NAME" > "/tmp/commit-info/${SERVER_NAME}.name"
+            echo "${{ matrix.spec }}" > "/tmp/commit-info/${SERVER_NAME}.spec"
           fi
-
-      - name: Push changes
+      
+      - name: Upload commit info
         if: (steps.update.outputs.changed == 'true' || steps.update.outputs.warning-added == 'true') && github.event_name == 'pull_request'
-        run: |
-          git push
+        uses: actions/upload-artifact@v4
+        with:
+          name: commit-info-${{ steps.server-info.outputs.server-name }}
+          path: /tmp/commit-info/
 
       - name: Output diff for workflow dispatch
         if: github.event_name == 'workflow_dispatch' && (steps.update.outputs.changed == 'true' || steps.update.outputs.warning-added == 'true')
@@ -247,6 +245,89 @@ jobs:
           echo "**Spec File**: \`${{ matrix.spec }}\`" >> $GITHUB_STEP_SUMMARY
           echo "**Triggered by**: @${{ github.actor }}" >> $GITHUB_STEP_SUMMARY
 
+  commit-all-changes:
+    name: Commit All Tool Updates
+    needs: update-tools
+    if: always() && needs.detect-changes.outputs.has-changes == 'true' && github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          ref: ${{ github.head_ref || github.ref }}
+
+      - name: Download all commit info artifacts
+        uses: actions/download-artifact@v5
+        with:
+          path: /tmp/artifacts/
+          pattern: commit-info-*
+          merge-multiple: true
+
+      - name: Check if any changes were made
+        id: check_changes
+        run: |
+          if [ -d "/tmp/artifacts" ] && [ "$(ls -A /tmp/artifacts 2>/dev/null)" ]; then
+            echo "changes=true" >> $GITHUB_OUTPUT
+            echo "Found commit info files:"
+            ls -la /tmp/artifacts/
+          else
+            echo "changes=false" >> $GITHUB_OUTPUT
+            echo "No changes to commit"
+          fi
+
+      - name: Commit and push all changes
+        if: steps.check_changes.outputs.changes == 'true'
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Action"
+          
+          # Pull any remote changes first to avoid conflicts
+          git pull origin ${{ github.head_ref || github.ref_name }} --rebase
+          
+          # Collect all the server names that were updated
+          UPDATED_SERVERS=""
+          WARNING_SERVERS=""
+          
+          for file in /tmp/artifacts/*.type; do
+            if [ -f "$file" ]; then
+              SERVER_NAME=$(basename "$file" .type)
+              TYPE=$(cat "$file")
+              
+              if [ "$TYPE" = "update" ]; then
+                UPDATED_SERVERS="$UPDATED_SERVERS $SERVER_NAME"
+              else
+                WARNING_SERVERS="$WARNING_SERVERS $SERVER_NAME"
+              fi
+              
+              # Stage the corresponding spec file
+              SPEC_FILE=$(cat "/tmp/artifacts/${SERVER_NAME}.spec")
+              git add "$SPEC_FILE"
+            fi
+          done
+          
+          # Create commit message
+          COMMIT_MSG="chore: update tool lists for MCP servers"
+          
+          if [ -n "$UPDATED_SERVERS" ]; then
+            COMMIT_MSG="$COMMIT_MSG\n\nUpdated servers:$(echo $UPDATED_SERVERS | sed 's/ /\\n- /g' | sed 's/^/\\n- /')"
+          fi
+          
+          if [ -n "$WARNING_SERVERS" ]; then
+            COMMIT_MSG="$COMMIT_MSG\n\nWarning added for servers:$(echo $WARNING_SERVERS | sed 's/ /\\n- /g' | sed 's/^/\\n- /')"
+          fi
+          
+          COMMIT_MSG="$COMMIT_MSG\n\nAutomatically updated using 'thv mcp list' command.\n\nCo-authored-by: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
+          
+          # Check if there are actually any changes to commit
+          if ! git diff --cached --quiet; then
+            git commit -m "$COMMIT_MSG"
+            git push
+            echo "✅ Successfully committed and pushed all tool updates"
+          else
+            echo "ℹ️ No changes to commit (files may have been identical)"
+          fi
+
   comment-summary:
     name: Post Summary Comment
     needs: [detect-changes, update-tools]
@@ -262,6 +343,41 @@ jobs:
           comment-author: 'github-actions[bot]'
           body-includes: '## 🔧 MCP Server Tool List Updates'
 
+      - name: Download all commit info artifacts  
+        uses: actions/download-artifact@v5
+        with:
+          path: /tmp/comment-artifacts/
+          pattern: commit-info-*
+          merge-multiple: true
+
+      - name: Generate summary from artifacts
+        id: generate-summary
+        run: |
+          SUMMARY=""
+          
+          if [ -d "/tmp/comment-artifacts" ] && [ "$(ls -A /tmp/comment-artifacts 2>/dev/null)" ]; then
+            for file in /tmp/comment-artifacts/*.type; do
+              if [ -f "$file" ]; then
+                SERVER_NAME=$(basename "$file" .type)
+                TYPE=$(cat "$file")
+                
+                if [ "$TYPE" = "update" ]; then
+                  SUMMARY="$SUMMARY| $SERVER_NAME | ✅ Updated | Tool list refreshed |\n"
+                else
+                  SUMMARY="$SUMMARY| $SERVER_NAME | ⚠️ Warning | Could not fetch tools, added warning comment |\n"
+                fi
+              fi
+            done
+          fi
+          
+          if [ -z "$SUMMARY" ]; then
+            SUMMARY="| _No changes detected_ | | |"
+          fi
+          
+          echo "summary<<EOF" >> $GITHUB_OUTPUT
+          echo -e "$SUMMARY" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
       - name: Create or update comment
         if: github.event_name == 'pull_request'
         uses: peter-evans/create-or-update-comment@v4
@@ -277,7 +393,7 @@ jobs:
             
             | Server | Status | Details |
             |--------|--------|---------|
-            ${{ needs.update-tools.outputs.summary || '| _Processing results..._ | | |' }}
+            ${{ steps.generate-summary.outputs.summary }}
             
             ---
             _This comment is automatically generated and will be updated as the workflow progresses._

Taskfile.yml

@@ -260,6 +260,13 @@ tasks:
     cmds:
       - ./{{.BUILD_DIR}}/registry-builder version
 
+  sync-schema:
+    desc: Sync schema reference with Go dependency version
+    cmds:
+      - echo "🔄 Syncing schema version with Go dependency..."
+      - ./scripts/sync-schema-version.sh
+      - echo "✅ Schema sync complete. Run 'task validate' to verify."
+
   watch:
     desc: Watch for changes and rebuild (requires entr)
     cmds:

registry/adb-mysql-mcp-server/spec.yaml

@@ -61,6 +61,6 @@ provenance:
   signer_identity: /.github/workflows/build-containers.yml
   sigstore_url: tuf-repo-cdn.sigstore.dev
 metadata:
-  stars: 15
+  stars: 16
   pulls: 0
-  last_updated: 2025-08-22T09:45:12Z
+  last_updated: 2025-09-07T02:30:47Z

registry/agentql-mcp/spec.yaml

@@ -50,6 +50,6 @@ provenance:
   signer_identity: /.github/workflows/build-containers.yml
   sigstore_url: tuf-repo-cdn.sigstore.dev
 metadata:
-  stars: 104
+  stars: 108
   pulls: 0
-  last_updated: 2025-08-22T09:45:12Z
+  last_updated: 2025-09-07T02:30:47Z

registry/apollo-mcp-server/spec.yaml

@@ -0,0 +1,35 @@
+# WARNING: Tool list fetch failed on 2025-09-08
+# Manual verification may be required
+name: apollo-mcp-server
+image: ghcr.io/apollographql/apollo-mcp-server:v0.7.5
+description: Exposes GraphQL operations as MCP tools for AI-driven API orchestration with Apollo
+tier: Official
+status: Active
+transport: streamable-http
+target_port: 5000
+repository_url: https://github.com/apollographql/apollo-mcp-server
+homepage: https://www.apollographql.com/docs/apollo-mcp-server
+license: MIT
+tags:
+  - graphql
+  - api
+  - orchestration
+  - apollo
+  - mcp
+tools:
+  # Tools are generated from your GraphQL operation names. Replace this with your actual operations.
+  - example_GetAstronautsCurrentlyInSpace
+env_vars:
+  - name: APOLLO_GRAPH_REF
+    description: Graph ref (graph ID and variant) used to fetch persisted queries or schema (required if no config file)
+    required: false
+  - name: APOLLO_KEY
+    description: Apollo Studio API key for the graph (required if no config file)
+    required: false
+    secret: true
+permissions:
+  network:
+    outbound:
+      insecure_allow_all: true
+      allow_port:
+        - 443

registry/arxiv-mcp-server/spec.yaml

@@ -5,7 +5,7 @@
 # Import timestamp: 2025-08-14T07:27:00Z
 # ---
 name: arxiv-mcp-server
-description: Enables AI assistants to search and access arXiv research papers through MCP protocol. Mount a volume to /arxiv-papers for persistent paper storage.
+description: AI assistants search and access arXiv papers through MCP with persistent paper storage
 tier: Community
 status: Active
 transport: stdio

registry/astra-db-mcp/spec.yaml

@@ -71,4 +71,4 @@ provenance:
 metadata:
   stars: 29
   pulls: 0
-  last_updated: 2025-08-22T09:45:12Z
+  last_updated: 2025-09-07T02:30:48Z

registry/aws-diagram/spec.yaml

@@ -30,9 +30,9 @@ env_vars:
     default: ERROR
 args: []
 metadata:
-  stars: 6006
+  stars: 6233
   pulls: 0
-  last_updated: "2025-08-24T02:35:25Z"
+  last_updated: "2025-09-07T02:30:48Z"
 repository_url: https://github.com/awslabs/mcp
 tags:
   - aws

registry/aws-documentation/spec.yaml

@@ -32,9 +32,9 @@ env_vars:
     default: ERROR
 args: []
 metadata:
-  stars: 6051
+  stars: 6243
   pulls: 0
-  last_updated: 2025-08-26T02:32:12Z
+  last_updated: 2025-09-08T02:31:33Z
 repository_url: https://github.com/awslabs/mcp
 tags:
   - aws