Merge branch 'main' into ni/feature-flags

Author: nirinchev

.github/workflows/publish.yml

@@ -80,11 +80,6 @@ jobs:
     if: needs.check.outputs.VERSION_EXISTS == 'false'
     steps:
       - uses: GitHubSecurityLab/actions-permissions/monitor@v1
-      - uses: mongodb-js/devtools-shared/actions/setup-bot-token@main
-        id: app-token
-        with:
-          app-id: ${{ vars.DEVTOOLS_BOT_APP_ID }}
-          private-key: ${{ secrets.DEVTOOLS_BOT_PRIVATE_KEY }}
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
         with:
@@ -106,13 +101,3 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           gh release create ${{ needs.check.outputs.VERSION }} --title "${{ needs.check.outputs.VERSION }}" --generate-notes --target ${{ github.sha }} ${{ (needs.check.outputs.RELEASE_CHANNEL != 'latest' && '--prerelease') || ''}}
-
-      - name: Install MCP Publisher
-        run: |
-          curl -L "https://github.com/modelcontextprotocol/registry/releases/latest/download/mcp-publisher_$(uname -s | tr '[:upper:]' '[:lower:]')_$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/').tar.gz" | tar xz mcp-publisher
-
-      - name: Login to MCP Registry
-        run: ./mcp-publisher login github --token ${{ steps.app-token.outputs.token }}
-
-      - name: Publish to MCP Registry
-        run: ./mcp-publisher publish

.github/workflows/registry-publish.yml

@@ -0,0 +1,25 @@
+---
+name: Publish to MCP Registry
+on:
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    environment: Production
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - uses: GitHubSecurityLab/actions-permissions/monitor@v1
+      - uses: actions/checkout@v5
+
+      - name: Install MCP Publisher
+        run: |
+          curl -L "https://github.com/modelcontextprotocol/registry/releases/latest/download/mcp-publisher_$(uname -s | tr '[:upper:]' '[:lower:]')_$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/').tar.gz" | tar xz mcp-publisher
+
+      - name: Login to MCP Registry
+        run: ./mcp-publisher login github-oidc
+
+      - name: Publish to MCP Registry
+        run: ./mcp-publisher publish

package-lock.json

@@ -66,7 +66,7 @@
     "@ai-sdk/google": "^2.0.23",
     "@ai-sdk/openai": "^2.0.52",
     "@eslint/js": "^9.34.0",
-    "@modelcontextprotocol/inspector": "^0.16.5",
+    "@modelcontextprotocol/inspector": "^0.17.1",
     "@mongodb-js/oidc-mock-provider": "^0.11.3",
     "@redocly/cli": "^2.0.8",
     "@types/express": "^5.0.3",

package.json

@@ -178,7 +178,7 @@ function updateServerJsonEnvVars(envVars: EnvironmentVariable[]): void {
         version?: string;
         packages: {
             registryType?: string;
-            identifier?: string;
+            identifier: string;
             environmentVariables: EnvironmentVariable[];
             packageArguments?: unknown[];
             version?: string;
@@ -209,12 +209,13 @@ function updateServerJsonEnvVars(envVars: EnvironmentVariable[]): void {
         for (const pkg of serverJson.packages) {
             pkg.environmentVariables = envVarsArray as EnvironmentVariable[];
             pkg.packageArguments = packageArguments;
-            pkg.version = version;
 
-            // Update OCI identifier version tag if this is an OCI package
-            if (pkg.registryType === "oci" && pkg.identifier) {
+            // For OCI packages, update the version tag in the identifier and not a version field
+            if (pkg.registryType === "oci") {
                 // Replace the version tag in the OCI identifier (e.g., docker.io/mongodb/mongodb-mcp-server:1.0.0)
                 pkg.identifier = pkg.identifier.replace(/:[^:]+$/, `:${version}`);
+            } else {
+                pkg.version = version;
             }
         }
     }

scripts/generateArguments.ts

@@ -637,8 +637,7 @@
           "description": "API key for Voyage AI embeddings service (required for vector search operations with text-to-embedding conversion).",
           "isRequired": false
         }
-      ],
-      "version": "1.2.0"
+      ]
     }
   ]
 }

server.json

@@ -27,14 +27,33 @@ export const zVoyageModels = z
     .enum(["voyage-3-large", "voyage-3.5", "voyage-3.5-lite", "voyage-code-3"])
     .default("voyage-3-large");
 
+// Zod does not undestand JS boxed numbers (like Int32) as integer literals,
+// so we preprocess them to unwrap them so Zod understands them.
+function unboxNumber(v: unknown): number {
+    if (v && typeof v === "object" && typeof v.valueOf === "function") {
+        const n = Number(v.valueOf());
+        if (!Number.isNaN(n)) return n;
+    }
+    return v as number;
+}
+
 export const zVoyageEmbeddingParameters = z.object({
     outputDimension: z
-        .union([z.literal(256), z.literal(512), z.literal(1024), z.literal(2048), z.literal(4096)])
+        .preprocess(
+            unboxNumber,
+            z.union([z.literal(256), z.literal(512), z.literal(1024), z.literal(2048), z.literal(4096)])
+        )
         .optional()
         .default(1024),
-    outputDType: z.enum(["float", "int8", "uint8", "binary", "ubinary"]).optional().default("float"),
+    outputDtype: z.enum(["float", "int8", "uint8", "binary", "ubinary"]).optional().default("float"),
 });
 
+const zVoyageAPIParameters = zVoyageEmbeddingParameters
+    .extend({
+        inputType: z.enum(["query", "document"]),
+    })
+    .strip();
+
 type VoyageModels = z.infer<typeof zVoyageModels>;
 type VoyageEmbeddingParameters = z.infer<typeof zVoyageEmbeddingParameters> & EmbeddingParameters;
 
@@ -62,11 +81,15 @@ class VoyageEmbeddingsProvider implements EmbeddingsProvider<VoyageModels, Voyag
         content: EmbeddingsInput[],
         parameters: VoyageEmbeddingParameters
     ): Promise<Embeddings[]> {
+        // This ensures that if we receive any random parameter from the outside (agent or us)
+        // it's stripped before sending it to Voyage, as Voyage will reject the request on
+        // a single unknown parameter.
+        const voyage = zVoyageAPIParameters.parse(parameters);
         const model = this.voyage.textEmbeddingModel(modelId);
         const { embeddings } = await embedMany({
             model,
             values: content,
-            providerOptions: { voyage: parameters },
+            providerOptions: { voyage },
         });
 
         return embeddings;

src/common/search/embeddingsProvider.ts

@@ -47,7 +47,7 @@ const VectorSearchStage = z.object({
             filter: zEJSON()
                 .optional()
                 .describe(
-                    "MQL filter that can only use pre-filter fields from the index definition. Note to LLM: If unsure, use the `collection-indexes` tool to learn which fields can be used for pre-filtering."
+                    "MQL filter that can only use filter fields from the index definition. Note to LLM: If unsure, use the `collection-indexes` tool to learn which fields can be used for filtering."
                 ),
             embeddingParameters: zSupportedEmbeddingParameters
                 .optional()
@@ -59,11 +59,21 @@ const VectorSearchStage = z.object({
 });
 
 export const AggregateArgs = {
-    pipeline: z
-        .array(z.union([AnyStage, VectorSearchStage]))
-        .describe(
-            "An array of aggregation stages to execute. $vectorSearch can only appear as the first stage of the aggregation pipeline or as the first stage of a $unionWith subpipeline. When using $vectorSearch, unless the user explicitly asks for the embeddings, $unset any embedding field to avoid reaching context limits."
-        ),
+    pipeline: z.array(z.union([AnyStage, VectorSearchStage])).describe(
+        `An array of aggregation stages to execute.  
+\`$vectorSearch\` **MUST** be the first stage of the pipeline, or the first stage of a \`$unionWith\` subpipeline.
+### Usage Rules for \`$vectorSearch\`
+- **Unset embeddings:**  
+  Unless the user explicitly requests the embeddings, add an \`$unset\` stage **at the end of the pipeline** to remove the embedding field and avoid context limits. **The $unset stage in this situation is mandatory**.
+- **Pre-filtering:**
+If the user requests additional filtering, include filters in \`$vectorSearch.filter\` only for pre-filter fields in the vector index.
+    NEVER include fields in $vectorSearch.filter that are not part of the vector index.
+- **Post-filtering:**
+    For all remaining filters, add a $match stage after $vectorSearch.
+### Note to LLM
+- If unsure which fields are filterable, use the collection-indexes tool to determine valid prefilter fields.
+- If no requested filters are valid prefilters, omit the filter key from $vectorSearch.`
+    ),
     responseBytesLimit: z.number().optional().default(ONE_MB).describe(`\
 The maximum number of bytes to return in the response. This value is capped by the server's configured maxBytesPerQuery and cannot be exceeded. \
 Note to LLM: If the entire aggregation result is required, use the "export" tool instead of increasing this limit.\