provide the state in the ctor

Author: nirinchev

src/tools/atlas/atlasTool.ts

@@ -1,9 +1,13 @@
 import { ZodRawShape } from "zod";
 import { ToolBase } from "../tool.js";
 import { ApiClient } from "../../client.js";
+import { State } from "../../state.js";
 
 export abstract class AtlasToolBase<Args extends ZodRawShape = ZodRawShape> extends ToolBase<Args> {
-    constructor(protected apiClient: ApiClient) {
-        super();
+    constructor(
+        state: State,
+        protected apiClient: ApiClient
+    ) {
+        super(state);
     }
 }

src/tools/atlas/listClusters.ts

@@ -4,6 +4,7 @@ import { config } from "../../config.js";
 import { ensureAuthenticated } from "./auth.js";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "./atlasTool.js";
+import { State } from "../../state.js";
 
 export class ListClustersTool extends AtlasToolBase<{
     projectId: ZodString | ZodOptional<ZodString>;
@@ -12,8 +13,8 @@ export class ListClustersTool extends AtlasToolBase<{
     protected description = "List MongoDB Atlas clusters";
     protected argsShape;
 
-    constructor(apiClient: ApiClient) {
-        super(apiClient);
+    constructor(state: State, apiClient: ApiClient) {
+        super(state, apiClient);
 
         let projectIdFilter: ZodString | ZodOptional<ZodString> = z
             .string()

src/tools/atlas/tools.ts

@@ -9,12 +9,12 @@ import { ListProjectsTool } from "./listProjects.js";
 
 export function registerAtlasTools(server: McpServer, state: State, apiClient: ApiClient) {
     const tools: ToolBase<ZodRawShape>[] = [
-        new AuthTool(apiClient),
-        new ListClustersTool(apiClient),
-        new ListProjectsTool(apiClient),
+        new AuthTool(state, apiClient),
+        new ListClustersTool(state, apiClient),
+        new ListProjectsTool(state, apiClient),
     ];
 
     for (const tool of tools) {
-        tool.register(server, state);
+        tool.register(server);
     }
 }

src/tools/tool.ts

@@ -5,7 +5,6 @@ import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { State } from "../state.js";
 
 export abstract class ToolBase<Args extends ZodRawShape> {
-    protected state: State = undefined!; // We should never use this before it's set
     protected abstract name: string;
 
     protected abstract description: string;
@@ -14,9 +13,9 @@ export abstract class ToolBase<Args extends ZodRawShape> {
 
     protected abstract execute(args: z.objectOutputType<Args, ZodTypeAny>): Promise<CallToolResult>;
 
-    public register(server: McpServer, state: State): void {
-        this.state = state;
+    protected constructor(protected state: State) {}
 
+    public register(server: McpServer): void {
         const callback = async (args: z.objectOutputType<Args, ZodTypeAny>): Promise<CallToolResult> => {
             try {
                 // TODO: add telemetry here