Register suggest_query_params in core

src/__tests__/cross-entry-point.test.ts

@@ -5,6 +5,7 @@ import { setPineconeClient } from '../core/index.js';
 import { resolveConfig } from '../core/config.js';
 import { getDefaultServerContext } from '../core/server/server-context.js';
 import * as guidedQueryTool from '../core/server/tools/guided-query-tool.js';
+import * as suggestQueryParamsTool from '../core/server/tools/suggest-query-params-tool.js';
 import { registerQueryTool } from '../core/server/tools/query-tool.js';
 import {
   assertToolErrorCode,
@@ -119,4 +120,22 @@ describe('cross-entry-point: core vs Alliance defaults', () => {
     expect(ctx.hasToolsRegistered()).toBe(true);
     registerSpy.mockRestore();
   });
+
+  it('core setup registers suggest_query_params handler (#221)', async () => {
+    const cfg = resolveConfig({ apiKey: 'sk-cross', indexName: 'test-index' });
+    const ctx = createTestServerContext({
+      config: cfg,
+      client: new PineconeClient({
+        apiKey: cfg.apiKey,
+        indexName: cfg.indexName,
+        defaultTopK: cfg.defaultTopK,
+      }),
+    });
+    const registerSpy = vi.spyOn(suggestQueryParamsTool, 'registerSuggestQueryParamsTool');
+
+    await setupCoreServer({ context: ctx });
+
+    expect(registerSpy).toHaveBeenCalledOnce();
+    registerSpy.mockRestore();
+  });
 });

src/__tests__/mcp-rc-readiness.test.ts

@@ -35,6 +35,7 @@ const CORE_TOOLS = [
   'query_documents',
   'generate_urls',
   'guided_query',
+  'suggest_query_params',
 ].sort();
 
 /** A fresh, isolated core server (own context + mock client) so several can coexist. */

src/alliance/setup.ts

@@ -5,7 +5,6 @@ import { createServer, type AllianceServerContext } from '../core/server/server-
 import { resolveAllianceConfig } from './config.js';
 import { setupCoreServerOnContext, type ServerHandle } from '../core/setup.js';
 import { registerBuiltinUrlGenerators } from './url-builtins.js';
-import { registerSuggestQueryParamsTool } from './tools/suggest-query-params-tool.js';
 
 /**
  * Options for {@link setupAllianceServer}.
@@ -114,6 +113,5 @@ export async function setupAllianceServer(
   }
 
   registerBuiltinUrlGenerators(resolvedCtx);
-  registerSuggestQueryParamsTool(server, resolvedCtx);
   return server;
 }

src/core/server/tools/guided-query-tool.context.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it, vi } from 'vitest';
 import { registerBuiltinUrlGenerators } from '../../../alliance/url-builtins.js';
 import { guidedQueryResponseSchema } from '../response-schemas.js';
 import { registerQueryTool } from './query-tool.js';
-import { registerSuggestQueryParamsTool } from '../../../alliance/tools/suggest-query-params-tool.js';
+import { registerSuggestQueryParamsTool } from './suggest-query-params-tool.js';
 import { registerGuidedQueryTool } from './guided-query-tool.js';
 import {
   assertToolErrorCode,

src/alliance/tools/suggest-query-params-tool.context.test.ts → src/core/server/tools/suggest-query-params-tool.context.test.ts

@@ -1,15 +1,15 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
-import { registerQueryTool } from '../../core/server/tools/query-tool.js';
+import { registerQueryTool } from './query-tool.js';
 import { registerSuggestQueryParamsTool } from './suggest-query-params-tool.js';
-import { suggestQueryParamsResponseSchema } from '../../core/server/response-schemas.js';
+import { suggestQueryParamsResponseSchema } from '../response-schemas.js';
 import {
   createMockServer,
   createTestServerContext,
   expectMatchesResponseSchema,
   makeHybridQueryResult,
   mockNamespacesWithMetadataResult,
   parseToolJson,
-} from '../../core/server/tools/test-helpers.js';
+} from './test-helpers.js';
 
 const namespaceMetadata = {
   document_number: 'string',

src/alliance/tools/suggest-query-params-tool.test.ts → src/core/server/tools/suggest-query-params-tool.test.ts

@@ -1,19 +1,19 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { getNamespacesWithCache } from '../../core/server/namespaces-cache.js';
-import { markSuggested } from '../../core/server/suggestion-flow.js';
+import { getNamespacesWithCache } from '../namespaces-cache.js';
+import { markSuggested } from '../suggestion-flow.js';
 import { registerSuggestQueryParamsTool } from './suggest-query-params-tool.js';
 import {
   createMockServer,
   makeNamespaceCacheEntry,
   parseToolJson,
   assertToolErrorCode,
-} from '../../core/server/tools/test-helpers.js';
+} from './test-helpers.js';
 
-vi.mock('../../core/server/namespaces-cache.js', () => ({
+vi.mock('../namespaces-cache.js', () => ({
   getNamespacesWithCache: vi.fn(),
 }));
 
-vi.mock('../../core/server/suggestion-flow.js', () => ({
+vi.mock('../suggestion-flow.js', () => ({
   markSuggested: vi.fn(),
 }));
 

src/alliance/tools/suggest-query-params-tool.ts → src/core/server/tools/suggest-query-params-tool.ts

@@ -1,28 +1,28 @@
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
-import { normalizeNamespace } from '../../core/server/namespace-utils.js';
-import { getNamespacesWithCache } from '../../core/server/namespaces-cache.js';
-import { suggestQueryParams } from '../../core/server/query-suggestion.js';
-import type { ServerContext } from '../../core/server/server-context.js';
-import { markSuggested } from '../../core/server/suggestion-flow.js';
+import { normalizeNamespace } from '../namespace-utils.js';
+import { getNamespacesWithCache } from '../namespaces-cache.js';
+import { suggestQueryParams } from '../query-suggestion.js';
+import type { ServerContext } from '../server-context.js';
+import { markSuggested } from '../suggestion-flow.js';
 import {
   optionalSourceField,
   rejectSourceWithoutContext,
   resolveSourceForTool,
   sourceParamSchema,
   sourceValidationError,
-} from '../../core/server/source-tool-utils.js';
+} from '../source-tool-utils.js';
 import {
   classifyToolCatchError,
   lifecycleToolError,
   logToolError,
   validationToolError,
-} from '../../core/server/tool-error.js';
+} from '../tool-error.js';
 import {
   suggestQueryParamsResponseSchema,
   type SuggestQueryParamsResponse,
-} from '../../core/server/response-schemas.js';
-import { jsonErrorResponse, validatedJsonResponse } from '../../core/server/tool-response.js';
+} from '../response-schemas.js';
+import { jsonErrorResponse, validatedJsonResponse } from '../tool-response.js';
 
 /** Register the suggest_query_params tool on the MCP server. */
 export function registerSuggestQueryParamsTool(server: McpServer, ctx?: ServerContext): void {

src/core/setup.ts

@@ -19,6 +19,7 @@ import { registerKeywordSearchTool } from './server/tools/keyword-search-tool.js
 import { registerListNamespacesTool } from './server/tools/list-namespaces-tool.js';
 import { registerNamespaceRouterTool } from './server/tools/namespace-router-tool.js';
 import { registerQueryDocumentsTool } from './server/tools/query-documents-tool.js';
+import { registerSuggestQueryParamsTool } from './server/tools/suggest-query-params-tool.js';
 import { registerQueryTool } from './server/tools/query-tool.js';
 
 /** MCP server handle with automatic teardown via `await using`. */
@@ -164,6 +165,7 @@ async function registerCoreToolSurface(
   registerQueryDocumentsTool(server, ctx);
   registerGenerateUrlsTool(server, ctx);
   registerGuidedQueryTool(server, ctx);
+  registerSuggestQueryParamsTool(server, ctx);
 
   ctx.getConfig();
   if (ctx.isMultiSource()) {