Merge branch 'main' into ni/perf-advisor-telemetry

src/tools/tool.ts

@@ -6,7 +6,7 @@ import type { Session } from "../common/session.js";
 import { LogId } from "../common/logger.js";
 import type { Telemetry } from "../telemetry/telemetry.js";
 import type { TelemetryToolMetadata, ToolEvent } from "../telemetry/types.js";
-import type { PreviewFeature, UserConfig } from "../common/config.js";
+import type { UserConfig } from "../common/config.js";
 import type { Server } from "../server.js";
 import type { Elicitation } from "../elicitation.js";
 import type { PreviewFeature } from "../common/schemas.js";

tests/unit/toolBase.test.ts

@@ -2,18 +2,25 @@ import type { Mock } from "vitest";
 import { describe, it, expect, vi, beforeEach, type MockedFunction } from "vitest";
 import type { ZodRawShape } from "zod";
 import { z } from "zod";
-import { ToolBase, type OperationType, type ToolCategory, type ToolConstructorParams } from "../../src/tools/tool.js";
+import type {
+ ToolCallbackArgs,
+ OperationType,
+ ToolCategory,
+ ToolConstructorParams,
+ ToolArgs,
+} from "../../src/tools/tool.js";
+import { ToolBase } from "../../src/tools/tool.js";
 import type { CallToolResult, ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
 import type { Session } from "../../src/common/session.js";
 import type { UserConfig } from "../../src/common/config.js";
 import type { Telemetry } from "../../src/telemetry/telemetry.js";
 import type { Elicitation } from "../../src/elicitation.js";
 import type { CompositeLogger } from "../../src/common/logger.js";
-import type { TelemetryToolMetadata, ToolArgs, ToolCallbackArgs } from "../../src/tools/tool.js";
 import type { ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
 import type { Server } from "../../src/server.js";
-import type { ToolEvent } from "../../src/telemetry/types.js";
+import type { TelemetryToolMetadata, ToolEvent } from "../../src/telemetry/types.js";
 import { expectDefined } from "../integration/helpers.js";
+import type { PreviewFeature } from "../../src/common/schemas.js";
 
 describe("ToolBase", () => {
  let mockSession: Session;
@@ -198,7 +205,7 @@ class TestTool extends ToolBase {
  if (args.param2 === 3) {
  return {
  test_param2: "three",
- };
+ } as TelemetryToolMetadata;
  }
 
  return {};