yontrack-mcp 1.14.2 → 1.14.3

package/build/graphql-documents.test.js

@@ -12,10 +12,7 @@ const schemas = {
 // Yontrack 6 only: never sent to a v5 server (see docs/adr/0001-agent-context-tools-v6-only.md)
 const V6_ONLY = new Set(["src/tools/agent-context.ts", "src/tools/agent-context-support.ts"]);
 // Known invalid documents, as "version file NAME": these must be fixed, then removed from here
-const KNOWN_INVALID = new Set([
-    // search(type:) is required on v5, but the `search` tool sends it only when given
-    "v5 src/tools/search.ts SEARCH",
-]);
+const KNOWN_INVALID = new Set([]);
 const sourceFiles = [
     "src/capabilities.ts",
     "src/utils.ts",

package/build/tools/search.js

@@ -1,67 +1,71 @@
 import { z } from "zod";
 import { gqlClient } from "../client.js";
+// `type` is required on v5 (and deprecated, but still accepted, on v6)
 const SEARCH = `
-  query Search($token: String!, $type: String, $size: Int) {
+  query Search($token: String!, $type: String!, $size: Int) {
     search(token: $token, type: $type, size: $size) {
       pageItems {
         type { id name description }
         title
         description
         accuracy
+        data
       }
       pageInfo { totalSize }
     }
   }
 `;
-const SEARCH_TYPED = `
-  query SearchTyped($token: String!, $type: String!, $size: Int) {
-    search(token: $token, type: $type, size: $size) {
-      pageItems {
-        type { id name description }
-        title
-        description
-        accuracy
-        data
-      }
-      pageInfo { totalSize }
-    }
+const SEARCH_RESULT_TYPES = `
+  query SearchResultTypes {
+    searchResultTypes { id }
   }
 `;
+async function searchType(token, type, size) {
+    const data = await gqlClient.request(SEARCH, { token, type, size });
+    return data.search ?? { pageItems: [], pageInfo: { totalSize: 0 } };
+}
+/** Searches each type of result, keeping the best `size` results overall. */
+async function searchAllTypes(token, size) {
+    const { searchResultTypes } = await gqlClient.request(SEARCH_RESULT_TYPES);
+    const pages = await Promise.all(searchResultTypes.flatMap(({ id }) => (id ? [searchType(token, id, size)] : [])));
+    return {
+        pageItems: pages
+            .flatMap((page) => page.pageItems)
+            .sort((a, b) => (b.accuracy ?? 0) - (a.accuracy ?? 0))
+            .slice(0, size),
+        pageInfo: { totalSize: pages.reduce((total, page) => total + (page.pageInfo?.totalSize ?? 0), 0) },
+    };
+}
 export function registerSearchTools(server) {
     server.tool("search", "Full-text search across all Yontrack entities (projects, branches, builds, etc.)", {
         token: z.string().describe("Search query"),
-        type: z.string().optional().describe("Entity type filter (e.g. 'project', 'build')"),
+        type: z
+            .string()
+            .optional()
+            .describe("Type of result to search for (e.g. 'project', 'build'); all types when omitted"),
         size: z.number().int().optional().default(10).describe("Max number of results"),
     }, async ({ token, type, size }) => {
-        const data = await gqlClient.request(SEARCH, { token, type, size });
+        const search = type ? await searchType(token, type, size) : await searchAllTypes(token, size);
         return {
-            content: [{ type: "text", text: JSON.stringify(data.search, null, 2) }],
+            content: [{ type: "text", text: JSON.stringify(search, null, 2) }],
         };
     });
     server.tool("search_commits", "Search for SCM commits by keyword or commit message", {
         token: z.string().describe("Search query (keyword or commit message fragment)"),
         size: z.number().int().optional().default(10).describe("Max number of results"),
     }, async ({ token, size }) => {
-        const data = await gqlClient.request(SEARCH_TYPED, {
-            token,
-            type: "scm-commit",
-            size,
-        });
+        const search = await searchType(token, "scm-commit", size);
         return {
-            content: [{ type: "text", text: JSON.stringify(data.search, null, 2) }],
+            content: [{ type: "text", text: JSON.stringify(search, null, 2) }],
         };
     });
     server.tool("search_issues", "Search for SCM issues by keyword or issue key", {
         token: z.string().describe("Search query (keyword or issue key)"),
         size: z.number().int().optional().default(10).describe("Max number of results"),
     }, async ({ token, size }) => {
-        const data = await gqlClient.request(SEARCH_TYPED, {
-            token,
-            type: "scm-issue",
-            size,
-        });
+        const search = await searchType(token, "scm-issue", size);
         return {
-            content: [{ type: "text", text: JSON.stringify(data.search, null, 2) }],
+            content: [{ type: "text", text: JSON.stringify(search, null, 2) }],
         };
     });
 }

package/build/tools/search.test.js

@@ -9,41 +9,47 @@ const mockRequest = gqlClient.request;
 beforeEach(() => {
     mockRequest.mockReset();
 });
+const result = (id, title, accuracy) => ({
+    type: { id, name: id, description: null },
+    title,
+    description: null,
+    accuracy,
+    data: null,
+});
+async function search(args) {
+    const client = await createTestClient(registerSearchTools);
+    const result = await client.callTool({ name: "search", arguments: args });
+    return JSON.parse(result.content[0].text);
+}
 describe("search", () => {
-    it("returns search results", async () => {
-        const search = {
-            pageItems: [
-                { type: { id: "project", name: "Project", description: null }, title: "myproject", description: null, accuracy: 1.0 },
-            ],
-            pageInfo: { totalSize: 1 },
-        };
-        mockRequest.mockResolvedValueOnce({ search });
-        const client = await createTestClient(registerSearchTools);
-        const result = await client.callTool({
-            name: "search",
-            arguments: { token: "myproject" },
-        });
-        const text = result.content[0].text;
-        expect(JSON.parse(text)).toEqual(search);
+    it("searches the given type only", async () => {
+        const page = { pageItems: [result("build", "1.0.0", 1.0)], pageInfo: { totalSize: 1 } };
+        mockRequest.mockResolvedValueOnce({ search: page });
+        expect(await search({ token: "foo", type: "build", size: 5 })).toEqual(page);
+        expect(mockRequest).toHaveBeenCalledTimes(1);
+        expect(mockRequest).toHaveBeenCalledWith(expect.any(String), { token: "foo", type: "build", size: 5 });
     });
-    it("returns empty results when nothing matches", async () => {
-        const search = { pageItems: [], pageInfo: { totalSize: 0 } };
-        mockRequest.mockResolvedValueOnce({ search });
-        const client = await createTestClient(registerSearchTools);
-        const result = await client.callTool({
-            name: "search",
-            arguments: { token: "zzznomatch" },
+    it("searches every type when none is given, best results first", async () => {
+        mockRequest
+            .mockResolvedValueOnce({ searchResultTypes: [{ id: "project" }, { id: "build" }] })
+            .mockResolvedValueOnce({
+            search: { pageItems: [result("project", "p1", 0.5), result("project", "p2", 0.1)], pageInfo: { totalSize: 2 } },
+        })
+            .mockResolvedValueOnce({
+            search: { pageItems: [result("build", "b1", 0.9)], pageInfo: { totalSize: 7 } },
         });
-        const text = result.content[0].text;
-        expect(JSON.parse(text)).toEqual(search);
-    });
-    it("passes type and size filters to the GraphQL client", async () => {
-        mockRequest.mockResolvedValueOnce({ search: { pageItems: [], pageInfo: { totalSize: 0 } } });
-        const client = await createTestClient(registerSearchTools);
-        await client.callTool({
-            name: "search",
-            arguments: { token: "foo", type: "build", size: 5 },
+        expect(await search({ token: "foo", size: 2 })).toEqual({
+            pageItems: [result("build", "b1", 0.9), result("project", "p1", 0.5)],
+            pageInfo: { totalSize: 9 },
         });
-        expect(mockRequest).toHaveBeenCalledWith(expect.any(String), { token: "foo", type: "build", size: 5 });
+        expect(mockRequest).toHaveBeenCalledWith(expect.stringContaining("searchResultTypes"));
+        expect(mockRequest).toHaveBeenCalledWith(expect.any(String), { token: "foo", type: "project", size: 2 });
+        expect(mockRequest).toHaveBeenCalledWith(expect.any(String), { token: "foo", type: "build", size: 2 });
+    });
+    it("returns empty results when nothing matches", async () => {
+        mockRequest
+            .mockResolvedValueOnce({ searchResultTypes: [{ id: "project" }] })
+            .mockResolvedValueOnce({ search: { pageItems: [], pageInfo: { totalSize: 0 } } });
+        expect(await search({ token: "zzznomatch" })).toEqual({ pageItems: [], pageInfo: { totalSize: 0 } });
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yontrack-mcp",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "description": "MCP server for Yontrack (Ontrack CI/CD monitoring platform)",
   "repository": {
     "type": "git",