fix: make hevy-mcp CLI start stdio server again

package.json

@@ -14,16 +14,16 @@
 	},
 	"homepage": "https://github.com/chrisdoc/hevy-mcp#readme",
 	"bin": {
-		"hevy-mcp": "dist/index.js"
+		"hevy-mcp": "dist/cli.js"
 	},
 	"scripts": {
-		"inspect": "pnpm run build && pnpm dlx @modelcontextprotocol/inspector@latest node dist/index.js",
+		"inspect": "pnpm run build && pnpm dlx @modelcontextprotocol/inspector@latest node dist/cli.js",
 		"test": "vitest --run",
 		"export-specs": "node ./scripts/export-openapi-spec.js",
 		"build": "tsup",
 		"build:client": "kubb generate",
-		"start": "node dist/index.js",
-		"dev": "tsx watch --clear-screen=false src/index.ts",
+		"start": "node dist/cli.js",
+		"dev": "tsx watch --clear-screen=false src/cli.ts",
 		"smithery:build": "smithery build",
 		"smithery:dev": "smithery dev",
 		"check": "biome check --write --unsafe",

src/cli.ts

@@ -0,0 +1,6 @@
+import { runServer } from "./index.js";
+
+void runServer().catch((error) => {
+	console.error("Fatal error in main():", error);
+	process.exit(1);
+});

src/index.test.ts

@@ -1,7 +1,57 @@
-import { describe, expect, it } from "vitest";
-import createServer, { configSchema } from "./index.js";
+import * as stdioModule from "@modelcontextprotocol/sdk/server/stdio.js";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import createServer, { configSchema, runServer } from "./index.js";
+import { createClient } from "./utils/hevyClient.js";
+
+const originalEnv = { ...process.env };
+const originalArgv = [...process.argv];
+
+vi.mock("./utils/hevyClient.js", () => ({
+	createClient: vi.fn().mockReturnValue({ mockedClient: true }),
+}));
+
+vi.mock("@modelcontextprotocol/sdk/server/mcp.js", () => {
+	class MockMcpServer {
+		server = { mockServer: true };
+		connect = vi.fn().mockResolvedValue(undefined);
+		tool = vi.fn();
+	}
+
+	return {
+		McpServer: MockMcpServer,
+	};
+});
+
+vi.mock("@modelcontextprotocol/sdk/server/stdio.js", () => {
+	const transports: unknown[] = [];
+	class MockStdioServerTransport {
+		constructor() {
+			transports.push(this);
+		}
+	}
+
+	return {
+		StdioServerTransport: MockStdioServerTransport,
+		__transports: transports,
+	};
+});
+
+describe("Server entry", () => {
+	beforeEach(() => {
+		process.env = { ...originalEnv };
+		process.argv = [...originalArgv];
+		vi.clearAllMocks();
+		const anyStdioModule = stdioModule as { __transports?: unknown[] };
+		if (anyStdioModule.__transports) {
+			anyStdioModule.__transports.length = 0;
+		}
+	});
+
+	afterEach(() => {
+		process.env = { ...originalEnv };
+		process.argv = [...originalArgv];
+	});
 
-describe("Smithery exports", () => {
 	it("validates HEVY_API_KEY via configSchema", () => {
 		expect(() => configSchema.parse({ apiKey: "" })).toThrow();
 		const parsed = configSchema.parse({ apiKey: "abc" });
@@ -12,4 +62,54 @@ describe("Smithery exports", () => {
 		const server = createServer({ config: { apiKey: "test-key" } });
 		expect(server).toBeDefined();
 	});
+
+	describe("runServer", () => {
+		it("uses HEVY_API_KEY from the environment and connects stdio transport", async () => {
+			process.env = {
+				...originalEnv,
+				HEVY_API_KEY: "test-api-key",
+			};
+			process.argv = originalArgv.slice(0, 2);
+
+			await runServer();
+			expect(createClient).toHaveBeenCalledWith(
+				"test-api-key",
+				"https://api.hevyapp.com",
+			);
+			const anyStdioModule = stdioModule as { __transports?: unknown[] };
+			expect(anyStdioModule.__transports?.length).toBeGreaterThan(0);
+		});
+
+		it("prefers CLI --hevy-api-key argument over environment variable", async () => {
+			process.env = {
+				...originalEnv,
+				HEVY_API_KEY: "env-key",
+			};
+			process.argv = [...originalArgv.slice(0, 2), "--hevy-api-key=cli-key"];
+
+			await runServer();
+			expect(createClient).toHaveBeenCalledWith(
+				"cli-key",
+				"https://api.hevyapp.com",
+			);
+		});
+
+		it("exits the process when no API key is provided", async () => {
+			process.env = {
+				...originalEnv,
+				HEVY_API_KEY: "",
+			};
+			process.argv = originalArgv.slice(0, 2);
+
+			const exitSpy = vi
+				.spyOn(process, "exit")
+				.mockImplementation((_code?: number) => {
+					throw new Error("process.exit called");
+				});
+
+			await expect(runServer()).rejects.toThrow();
+			expect(exitSpy).toHaveBeenCalledWith(1);
+			exitSpy.mockRestore();
+		});
+	});
 });

src/index.ts

@@ -1,4 +1,3 @@
-import { fileURLToPath } from "node:url";
 import dotenvx from "@dotenvx/dotenvx";
 
 // Configure dotenvx with quiet mode to prevent stdout pollution in stdio mode
@@ -52,7 +51,7 @@ export default function createServer({ config }: { config: ServerConfig }) {
 	return server.server;
 }
 
-async function runServer() {
+export async function runServer() {
 	const args = process.argv.slice(2);
 	const cfg = parseConfig(args, process.env);
 	const apiKey = cfg.apiKey;
@@ -63,25 +62,3 @@ async function runServer() {
 	const transport = new StdioServerTransport();
 	await server.connect(transport);
 }
-
-const isDirectExecution = (() => {
-	if (typeof process === "undefined" || !Array.isArray(process.argv)) {
-		return false;
-	}
-	if (typeof import.meta === "undefined" || !import.meta?.url) {
-		return false;
-	}
-	try {
-		const modulePath = fileURLToPath(import.meta.url);
-		return process.argv[1] === modulePath;
-	} catch {
-		return false;
-	}
-})();
-
-if (isDirectExecution) {
-	runServer().catch((error) => {
-		console.error("Fatal error in main():", error);
-		process.exit(1);
-	});
-}

tsup.config.ts

@@ -1,7 +1,7 @@
 import { defineConfig } from "tsup";
 
 export default defineConfig({
-	entry: ["src/index.ts"],
+	entry: ["src/index.ts", "src/cli.ts"],
 	format: ["esm"],
 	target: "esnext",
 	sourcemap: true,