pmxtjs 1.0.0 → 1.0.3

package/dist/esm/pmxt/client.d.ts

@@ -32,7 +32,9 @@ export declare abstract class Exchange {
     protected privateKey?: string;
     protected api: DefaultApi;
     protected serverManager: ServerManager;
+    protected initPromise: Promise<void>;
     constructor(exchangeName: string, options?: ExchangeOptions);
+    private initializeServer;
     protected handleResponse(response: any): any;
     protected getCredentials(): ExchangeCredentials | undefined;
     /**

package/dist/esm/pmxt/client.js

@@ -113,25 +113,39 @@ export class Exchange {
     privateKey;
     api;
     serverManager;
+    initPromise;
     constructor(exchangeName, options = {}) {
         this.exchangeName = exchangeName.toLowerCase();
         this.apiKey = options.apiKey;
         this.privateKey = options.privateKey;
-        const baseUrl = options.baseUrl || "http://localhost:3847";
+        let baseUrl = options.baseUrl || "http://localhost:3847";
         const autoStartServer = options.autoStartServer !== false;
         // Initialize server manager
         this.serverManager = new ServerManager({ baseUrl });
-        // Ensure server is running (unless disabled)
+        // Configure the API client with the initial base URL (will be updated if port changes)
+        const config = new Configuration({ basePath: baseUrl });
+        this.api = new DefaultApi(config);
+        // Initialize the server connection asynchronously
+        this.initPromise = this.initializeServer(autoStartServer);
+    }
+    async initializeServer(autoStartServer) {
         if (autoStartServer) {
-            this.serverManager.ensureServerRunning().catch((error) => {
+            try {
+                await this.serverManager.ensureServerRunning();
+                // Get the actual port the server is running on
+                // (may differ from default if default port was busy)
+                const actualPort = this.serverManager.getRunningPort();
+                const newBaseUrl = `http://localhost:${actualPort}`;
+                // Update API client with actual base URL
+                const newConfig = new Configuration({ basePath: newBaseUrl });
+                this.api = new DefaultApi(newConfig);
+            }
+            catch (error) {
                 throw new Error(`Failed to start PMXT server: ${error}\n\n` +
                     `Please ensure 'pmxt-core' is installed: npm install -g pmxt-core\n` +
                     `Or start the server manually: pmxt-server`);
-            });
+            }
         }
-        // Configure the API client
-        const config = new Configuration({ basePath: baseUrl });
-        this.api = new DefaultApi(config);
     }
     handleResponse(response) {
         if (!response.success) {
@@ -162,6 +176,7 @@ export class Exchange {
      * ```
      */
     async fetchMarkets(params) {
+        await this.initPromise;
         try {
             const args = [];
             if (params) {
@@ -195,6 +210,7 @@ export class Exchange {
      * ```
      */
     async searchMarkets(query, params) {
+        await this.initPromise;
         try {
             const args = [query];
             if (params) {
@@ -231,6 +247,7 @@ export class Exchange {
      * ```
      */
     async getMarketsBySlug(slug) {
+        await this.initPromise;
         try {
             const requestBody = {
                 args: [slug],
@@ -269,6 +286,7 @@ export class Exchange {
      * ```
      */
     async fetchOHLCV(outcomeId, params) {
+        await this.initPromise;
         try {
             const paramsDict = { resolution: params.resolution };
             if (params.start) {
@@ -309,6 +327,7 @@ export class Exchange {
      * ```
      */
     async fetchOrderBook(outcomeId) {
+        await this.initPromise;
         try {
             const requestBody = {
                 args: [outcomeId],
@@ -335,6 +354,7 @@ export class Exchange {
      * @returns List of trades
      */
     async fetchTrades(outcomeId, params) {
+        await this.initPromise;
         try {
             const paramsDict = { resolution: params.resolution };
             if (params.limit) {
@@ -375,6 +395,7 @@ export class Exchange {
      * ```
      */
     async createOrder(params) {
+        await this.initPromise;
         try {
             const paramsDict = {
                 marketId: params.marketId,
@@ -408,6 +429,7 @@ export class Exchange {
      * @returns Cancelled order
      */
     async cancelOrder(orderId) {
+        await this.initPromise;
         try {
             const requestBody = {
                 args: [orderId],
@@ -431,6 +453,7 @@ export class Exchange {
      * @returns Order details
      */
     async fetchOrder(orderId) {
+        await this.initPromise;
         try {
             const requestBody = {
                 args: [orderId],
@@ -454,6 +477,7 @@ export class Exchange {
      * @returns List of open orders
      */
     async fetchOpenOrders(marketId) {
+        await this.initPromise;
         try {
             const args = [];
             if (marketId) {
@@ -481,6 +505,7 @@ export class Exchange {
      * @returns List of positions
      */
     async fetchPositions() {
+        await this.initPromise;
         try {
             const requestBody = {
                 args: [],
@@ -503,6 +528,7 @@ export class Exchange {
      * @returns List of balances (by currency)
      */
     async fetchBalance() {
+        await this.initPromise;
         try {
             const requestBody = {
                 args: [],

package/dist/esm/pmxt/server-manager.d.ts

@@ -13,7 +13,23 @@ export declare class ServerManager {
     private maxRetries;
     private retryDelayMs;
     private api;
+    private lockPath;
+    private static readonly DEFAULT_PORT;
     constructor(options?: ServerManagerOptions);
+    /**
+     * Read server information from lock file.
+     */
+    private getServerInfo;
+    /**
+     * Get the actual port the server is running on.
+     *
+     * This reads the lock file to determine the actual port,
+     * which may differ from the default if the default port was busy.
+     */
+    getRunningPort(): number;
+    /**
+     * Check if the server is running.
+     */
     /**
      * Check if the server is running.
      */

package/dist/esm/pmxt/server-manager.js

@@ -4,25 +4,67 @@
  * Handles automatic server startup and health checks.
  */
 import { DefaultApi, Configuration } from "../generated/src/index.js";
+import { readFileSync, existsSync } from "fs";
+import { homedir } from "os";
+import { join, dirname } from "path";
 export class ServerManager {
     baseUrl;
     maxRetries;
     retryDelayMs;
     api;
+    lockPath;
+    static DEFAULT_PORT = 3847;
     constructor(options = {}) {
-        this.baseUrl = options.baseUrl || "http://localhost:3847";
+        this.baseUrl = options.baseUrl || `http://localhost:${ServerManager.DEFAULT_PORT}`;
         this.maxRetries = options.maxRetries || 30;
         this.retryDelayMs = options.retryDelayMs || 1000;
+        this.lockPath = join(homedir(), '.pmxt', 'server.lock');
         const config = new Configuration({ basePath: this.baseUrl });
         this.api = new DefaultApi(config);
     }
+    /**
+     * Read server information from lock file.
+     */
+    getServerInfo() {
+        try {
+            if (!existsSync(this.lockPath)) {
+                return null;
+            }
+            const content = readFileSync(this.lockPath, 'utf-8');
+            return JSON.parse(content);
+        }
+        catch {
+            return null;
+        }
+    }
+    /**
+     * Get the actual port the server is running on.
+     *
+     * This reads the lock file to determine the actual port,
+     * which may differ from the default if the default port was busy.
+     */
+    getRunningPort() {
+        const info = this.getServerInfo();
+        return info?.port || ServerManager.DEFAULT_PORT;
+    }
+    /**
+     * Check if the server is running.
+     */
     /**
      * Check if the server is running.
      */
     async isServerRunning() {
+        // Read lock file to get current port
+        const port = this.getRunningPort();
         try {
-            const response = await this.api.healthCheck();
-            return response.status === "ok";
+            // Use native fetch to check health on the actual running port
+            // This avoids issues where this.api is configured with the wrong port
+            const response = await fetch(`http://localhost:${port}/health`);
+            if (response.ok) {
+                const data = await response.json();
+                return data.status === "ok";
+            }
+            return false;
         }
         catch (error) {
             return false;
@@ -48,10 +90,27 @@ export class ServerManager {
         if (await this.isServerRunning()) {
             return;
         }
+        // Locate pmxt-ensure-server
+        let launcherPath = 'pmxt-ensure-server'; // Default to PATH
+        try {
+            // Try to resolve from pmxt-core dependency
+            // For CommonJS build (which is primary), we can use require directly
+            // For ESM build, this will be transpiled appropriately
+            const corePackageJson = require.resolve('pmxt-core/package.json');
+            const coreDir = dirname(corePackageJson);
+            const binPath = join(coreDir, 'bin', 'pmxt-ensure-server');
+            if (existsSync(binPath)) {
+                launcherPath = binPath;
+            }
+        }
+        catch (error) {
+            // If resolution fails, fall back to PATH
+            // This could happen in dev environments where pmxt-core is globally installed
+        }
         // Try to start the server using pmxt-ensure-server
         const { spawn } = await import("child_process");
         try {
-            const proc = spawn("pmxt-ensure-server", [], {
+            const proc = spawn(launcherPath, [], {
                 detached: true,
                 stdio: "ignore",
             });

package/dist/pmxt/client.d.ts

@@ -32,7 +32,9 @@ export declare abstract class Exchange {
     protected privateKey?: string;
     protected api: DefaultApi;
     protected serverManager: ServerManager;
+    protected initPromise: Promise<void>;
     constructor(exchangeName: string, options?: ExchangeOptions);
+    private initializeServer;
     protected handleResponse(response: any): any;
     protected getCredentials(): ExchangeCredentials | undefined;
     /**

package/dist/pmxt/client.js

@@ -116,25 +116,39 @@ class Exchange {
     privateKey;
     api;
     serverManager;
+    initPromise;
     constructor(exchangeName, options = {}) {
         this.exchangeName = exchangeName.toLowerCase();
         this.apiKey = options.apiKey;
         this.privateKey = options.privateKey;
-        const baseUrl = options.baseUrl || "http://localhost:3847";
+        let baseUrl = options.baseUrl || "http://localhost:3847";
         const autoStartServer = options.autoStartServer !== false;
         // Initialize server manager
         this.serverManager = new server_manager_js_1.ServerManager({ baseUrl });
-        // Ensure server is running (unless disabled)
+        // Configure the API client with the initial base URL (will be updated if port changes)
+        const config = new index_js_1.Configuration({ basePath: baseUrl });
+        this.api = new index_js_1.DefaultApi(config);
+        // Initialize the server connection asynchronously
+        this.initPromise = this.initializeServer(autoStartServer);
+    }
+    async initializeServer(autoStartServer) {
         if (autoStartServer) {
-            this.serverManager.ensureServerRunning().catch((error) => {
+            try {
+                await this.serverManager.ensureServerRunning();
+                // Get the actual port the server is running on
+                // (may differ from default if default port was busy)
+                const actualPort = this.serverManager.getRunningPort();
+                const newBaseUrl = `http://localhost:${actualPort}`;
+                // Update API client with actual base URL
+                const newConfig = new index_js_1.Configuration({ basePath: newBaseUrl });
+                this.api = new index_js_1.DefaultApi(newConfig);
+            }
+            catch (error) {
                 throw new Error(`Failed to start PMXT server: ${error}\n\n` +
                     `Please ensure 'pmxt-core' is installed: npm install -g pmxt-core\n` +
                     `Or start the server manually: pmxt-server`);
-            });
+            }
         }
-        // Configure the API client
-        const config = new index_js_1.Configuration({ basePath: baseUrl });
-        this.api = new index_js_1.DefaultApi(config);
     }
     handleResponse(response) {
         if (!response.success) {
@@ -165,6 +179,7 @@ class Exchange {
      * ```
      */
     async fetchMarkets(params) {
+        await this.initPromise;
         try {
             const args = [];
             if (params) {
@@ -198,6 +213,7 @@ class Exchange {
      * ```
      */
     async searchMarkets(query, params) {
+        await this.initPromise;
         try {
             const args = [query];
             if (params) {
@@ -234,6 +250,7 @@ class Exchange {
      * ```
      */
     async getMarketsBySlug(slug) {
+        await this.initPromise;
         try {
             const requestBody = {
                 args: [slug],
@@ -272,6 +289,7 @@ class Exchange {
      * ```
      */
     async fetchOHLCV(outcomeId, params) {
+        await this.initPromise;
         try {
             const paramsDict = { resolution: params.resolution };
             if (params.start) {
@@ -312,6 +330,7 @@ class Exchange {
      * ```
      */
     async fetchOrderBook(outcomeId) {
+        await this.initPromise;
         try {
             const requestBody = {
                 args: [outcomeId],
@@ -338,6 +357,7 @@ class Exchange {
      * @returns List of trades
      */
     async fetchTrades(outcomeId, params) {
+        await this.initPromise;
         try {
             const paramsDict = { resolution: params.resolution };
             if (params.limit) {
@@ -378,6 +398,7 @@ class Exchange {
      * ```
      */
     async createOrder(params) {
+        await this.initPromise;
         try {
             const paramsDict = {
                 marketId: params.marketId,
@@ -411,6 +432,7 @@ class Exchange {
      * @returns Cancelled order
      */
     async cancelOrder(orderId) {
+        await this.initPromise;
         try {
             const requestBody = {
                 args: [orderId],
@@ -434,6 +456,7 @@ class Exchange {
      * @returns Order details
      */
     async fetchOrder(orderId) {
+        await this.initPromise;
         try {
             const requestBody = {
                 args: [orderId],
@@ -457,6 +480,7 @@ class Exchange {
      * @returns List of open orders
      */
     async fetchOpenOrders(marketId) {
+        await this.initPromise;
         try {
             const args = [];
             if (marketId) {
@@ -484,6 +508,7 @@ class Exchange {
      * @returns List of positions
      */
     async fetchPositions() {
+        await this.initPromise;
         try {
             const requestBody = {
                 args: [],
@@ -506,6 +531,7 @@ class Exchange {
      * @returns List of balances (by currency)
      */
     async fetchBalance() {
+        await this.initPromise;
         try {
             const requestBody = {
                 args: [],

package/dist/pmxt/server-manager.d.ts

@@ -13,7 +13,23 @@ export declare class ServerManager {
     private maxRetries;
     private retryDelayMs;
     private api;
+    private lockPath;
+    private static readonly DEFAULT_PORT;
     constructor(options?: ServerManagerOptions);
+    /**
+     * Read server information from lock file.
+     */
+    private getServerInfo;
+    /**
+     * Get the actual port the server is running on.
+     *
+     * This reads the lock file to determine the actual port,
+     * which may differ from the default if the default port was busy.
+     */
+    getRunningPort(): number;
+    /**
+     * Check if the server is running.
+     */
     /**
      * Check if the server is running.
      */

package/dist/pmxt/server-manager.js

@@ -40,25 +40,67 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerManager = void 0;
 const index_js_1 = require("../generated/src/index.js");
+const fs_1 = require("fs");
+const os_1 = require("os");
+const path_1 = require("path");
 class ServerManager {
     baseUrl;
     maxRetries;
     retryDelayMs;
     api;
+    lockPath;
+    static DEFAULT_PORT = 3847;
     constructor(options = {}) {
-        this.baseUrl = options.baseUrl || "http://localhost:3847";
+        this.baseUrl = options.baseUrl || `http://localhost:${ServerManager.DEFAULT_PORT}`;
         this.maxRetries = options.maxRetries || 30;
         this.retryDelayMs = options.retryDelayMs || 1000;
+        this.lockPath = (0, path_1.join)((0, os_1.homedir)(), '.pmxt', 'server.lock');
         const config = new index_js_1.Configuration({ basePath: this.baseUrl });
         this.api = new index_js_1.DefaultApi(config);
     }
+    /**
+     * Read server information from lock file.
+     */
+    getServerInfo() {
+        try {
+            if (!(0, fs_1.existsSync)(this.lockPath)) {
+                return null;
+            }
+            const content = (0, fs_1.readFileSync)(this.lockPath, 'utf-8');
+            return JSON.parse(content);
+        }
+        catch {
+            return null;
+        }
+    }
+    /**
+     * Get the actual port the server is running on.
+     *
+     * This reads the lock file to determine the actual port,
+     * which may differ from the default if the default port was busy.
+     */
+    getRunningPort() {
+        const info = this.getServerInfo();
+        return info?.port || ServerManager.DEFAULT_PORT;
+    }
+    /**
+     * Check if the server is running.
+     */
     /**
      * Check if the server is running.
      */
     async isServerRunning() {
+        // Read lock file to get current port
+        const port = this.getRunningPort();
         try {
-            const response = await this.api.healthCheck();
-            return response.status === "ok";
+            // Use native fetch to check health on the actual running port
+            // This avoids issues where this.api is configured with the wrong port
+            const response = await fetch(`http://localhost:${port}/health`);
+            if (response.ok) {
+                const data = await response.json();
+                return data.status === "ok";
+            }
+            return false;
         }
         catch (error) {
             return false;
@@ -84,10 +126,27 @@ class ServerManager {
         if (await this.isServerRunning()) {
             return;
         }
+        // Locate pmxt-ensure-server
+        let launcherPath = 'pmxt-ensure-server'; // Default to PATH
+        try {
+            // Try to resolve from pmxt-core dependency
+            // For CommonJS build (which is primary), we can use require directly
+            // For ESM build, this will be transpiled appropriately
+            const corePackageJson = require.resolve('pmxt-core/package.json');
+            const coreDir = (0, path_1.dirname)(corePackageJson);
+            const binPath = (0, path_1.join)(coreDir, 'bin', 'pmxt-ensure-server');
+            if ((0, fs_1.existsSync)(binPath)) {
+                launcherPath = binPath;
+            }
+        }
+        catch (error) {
+            // If resolution fails, fall back to PATH
+            // This could happen in dev environments where pmxt-core is globally installed
+        }
         // Try to start the server using pmxt-ensure-server
         const { spawn } = await Promise.resolve().then(() => __importStar(require("child_process")));
         try {
-            const proc = spawn("pmxt-ensure-server", [], {
+            const proc = spawn(launcherPath, [], {
                 detached: true,
                 stdio: "ignore",
             });

package/generated/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmxtjs",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "OpenAPI client for pmxtjs",
   "author": "OpenAPI-Generator",
   "repository": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmxtjs",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "Unified prediction market data API - The ccxt for prediction markets",
   "author": "PMXT Contributors",
   "repository": {
@@ -41,6 +41,9 @@
     "api",
     "unified"
   ],
+  "dependencies": {
+    "pmxt-core": "1.0.3"
+  },
   "devDependencies": {
     "@types/jest": "^30.0.0",
     "@types/node": "^20.0.0",

package/pmxt/client.ts

@@ -172,32 +172,48 @@ export abstract class Exchange {
     protected privateKey?: string;
     protected api: DefaultApi;
     protected serverManager: ServerManager;
+    protected initPromise: Promise<void>;
 
     constructor(exchangeName: string, options: ExchangeOptions = {}) {
         this.exchangeName = exchangeName.toLowerCase();
         this.apiKey = options.apiKey;
         this.privateKey = options.privateKey;
 
-        const baseUrl = options.baseUrl || "http://localhost:3847";
+        let baseUrl = options.baseUrl || "http://localhost:3847";
         const autoStartServer = options.autoStartServer !== false;
 
         // Initialize server manager
         this.serverManager = new ServerManager({ baseUrl });
 
-        // Ensure server is running (unless disabled)
+        // Configure the API client with the initial base URL (will be updated if port changes)
+        const config = new Configuration({ basePath: baseUrl });
+        this.api = new DefaultApi(config);
+
+        // Initialize the server connection asynchronously
+        this.initPromise = this.initializeServer(autoStartServer);
+    }
+
+    private async initializeServer(autoStartServer: boolean): Promise<void> {
         if (autoStartServer) {
-            this.serverManager.ensureServerRunning().catch((error) => {
+            try {
+                await this.serverManager.ensureServerRunning();
+
+                // Get the actual port the server is running on
+                // (may differ from default if default port was busy)
+                const actualPort = this.serverManager.getRunningPort();
+                const newBaseUrl = `http://localhost:${actualPort}`;
+
+                // Update API client with actual base URL
+                const newConfig = new Configuration({ basePath: newBaseUrl });
+                this.api = new DefaultApi(newConfig);
+            } catch (error) {
                 throw new Error(
                     `Failed to start PMXT server: ${error}\n\n` +
                     `Please ensure 'pmxt-core' is installed: npm install -g pmxt-core\n` +
                     `Or start the server manually: pmxt-server`
                 );
-            });
+            }
         }
-
-        // Configure the API client
-        const config = new Configuration({ basePath: baseUrl });
-        this.api = new DefaultApi(config);
     }
 
     protected handleResponse(response: any): any {
@@ -232,6 +248,7 @@ export abstract class Exchange {
      * ```
      */
     async fetchMarkets(params?: MarketFilterParams): Promise<UnifiedMarket[]> {
+        await this.initPromise;
         try {
             const args: any[] = [];
             if (params) {
@@ -271,6 +288,7 @@ export abstract class Exchange {
         query: string,
         params?: MarketFilterParams
     ): Promise<UnifiedMarket[]> {
+        await this.initPromise;
         try {
             const args: any[] = [query];
             if (params) {
@@ -310,6 +328,7 @@ export abstract class Exchange {
      * ```
      */
     async getMarketsBySlug(slug: string): Promise<UnifiedMarket[]> {
+        await this.initPromise;
         try {
             const requestBody: GetMarketsBySlugRequest = {
                 args: [slug],
@@ -353,6 +372,7 @@ export abstract class Exchange {
         outcomeId: string,
         params: HistoryFilterParams
     ): Promise<PriceCandle[]> {
+        await this.initPromise;
         try {
             const paramsDict: any = { resolution: params.resolution };
             if (params.start) {
@@ -396,6 +416,7 @@ export abstract class Exchange {
      * ```
      */
     async fetchOrderBook(outcomeId: string): Promise<OrderBook> {
+        await this.initPromise;
         try {
             const requestBody: FetchOrderBookRequest = {
                 args: [outcomeId],
@@ -427,6 +448,7 @@ export abstract class Exchange {
         outcomeId: string,
         params: HistoryFilterParams
     ): Promise<Trade[]> {
+        await this.initPromise;
         try {
             const paramsDict: any = { resolution: params.resolution };
             if (params.limit) {
@@ -471,6 +493,7 @@ export abstract class Exchange {
      * ```
      */
     async createOrder(params: CreateOrderParams): Promise<Order> {
+        await this.initPromise;
         try {
             const paramsDict: any = {
                 marketId: params.marketId,
@@ -507,6 +530,7 @@ export abstract class Exchange {
      * @returns Cancelled order
      */
     async cancelOrder(orderId: string): Promise<Order> {
+        await this.initPromise;
         try {
             const requestBody: CancelOrderRequest = {
                 args: [orderId],
@@ -532,6 +556,7 @@ export abstract class Exchange {
      * @returns Order details
      */
     async fetchOrder(orderId: string): Promise<Order> {
+        await this.initPromise;
         try {
             const requestBody: CancelOrderRequest = {
                 args: [orderId],
@@ -557,6 +582,7 @@ export abstract class Exchange {
      * @returns List of open orders
      */
     async fetchOpenOrders(marketId?: string): Promise<Order[]> {
+        await this.initPromise;
         try {
             const args: any[] = [];
             if (marketId) {
@@ -588,6 +614,7 @@ export abstract class Exchange {
      * @returns List of positions
      */
     async fetchPositions(): Promise<Position[]> {
+        await this.initPromise;
         try {
             const requestBody: FetchPositionsRequest = {
                 args: [],
@@ -612,6 +639,7 @@ export abstract class Exchange {
      * @returns List of balances (by currency)
      */
     async fetchBalance(): Promise<Balance[]> {
+        await this.initPromise;
         try {
             const requestBody: FetchPositionsRequest = {
                 args: [],

package/pmxt/server-manager.ts

@@ -5,6 +5,9 @@
  */
 
 import { DefaultApi, Configuration } from "../generated/src/index.js";
+import { readFileSync, existsSync } from "fs";
+import { homedir } from "os";
+import { join, dirname } from "path";
 
 export interface ServerManagerOptions {
     baseUrl?: string;
@@ -12,28 +15,75 @@ export interface ServerManagerOptions {
     retryDelayMs?: number;
 }
 
+interface ServerLockInfo {
+    port: number;
+    pid: number;
+    timestamp: number;
+}
+
 export class ServerManager {
     private baseUrl: string;
     private maxRetries: number;
     private retryDelayMs: number;
     private api: DefaultApi;
+    private lockPath: string;
+    private static readonly DEFAULT_PORT = 3847;
 
     constructor(options: ServerManagerOptions = {}) {
-        this.baseUrl = options.baseUrl || "http://localhost:3847";
+        this.baseUrl = options.baseUrl || `http://localhost:${ServerManager.DEFAULT_PORT}`;
         this.maxRetries = options.maxRetries || 30;
         this.retryDelayMs = options.retryDelayMs || 1000;
+        this.lockPath = join(homedir(), '.pmxt', 'server.lock');
 
         const config = new Configuration({ basePath: this.baseUrl });
         this.api = new DefaultApi(config);
     }
 
+    /**
+     * Read server information from lock file.
+     */
+    private getServerInfo(): ServerLockInfo | null {
+        try {
+            if (!existsSync(this.lockPath)) {
+                return null;
+            }
+            const content = readFileSync(this.lockPath, 'utf-8');
+            return JSON.parse(content) as ServerLockInfo;
+        } catch {
+            return null;
+        }
+    }
+
+    /**
+     * Get the actual port the server is running on.
+     * 
+     * This reads the lock file to determine the actual port,
+     * which may differ from the default if the default port was busy.
+     */
+    getRunningPort(): number {
+        const info = this.getServerInfo();
+        return info?.port || ServerManager.DEFAULT_PORT;
+    }
+
+    /**
+     * Check if the server is running.
+     */
     /**
      * Check if the server is running.
      */
     async isServerRunning(): Promise<boolean> {
+        // Read lock file to get current port
+        const port = this.getRunningPort();
+
         try {
-            const response = await this.api.healthCheck();
-            return response.status === "ok";
+            // Use native fetch to check health on the actual running port
+            // This avoids issues where this.api is configured with the wrong port
+            const response = await fetch(`http://localhost:${port}/health`);
+            if (response.ok) {
+                const data = await response.json();
+                return (data as any).status === "ok";
+            }
+            return false;
         } catch (error) {
             return false;
         }
@@ -63,11 +113,30 @@ export class ServerManager {
             return;
         }
 
+        // Locate pmxt-ensure-server
+        let launcherPath = 'pmxt-ensure-server'; // Default to PATH
+
+        try {
+            // Try to resolve from pmxt-core dependency
+            // For CommonJS build (which is primary), we can use require directly
+            // For ESM build, this will be transpiled appropriately
+            const corePackageJson = require.resolve('pmxt-core/package.json');
+            const coreDir = dirname(corePackageJson);
+            const binPath = join(coreDir, 'bin', 'pmxt-ensure-server');
+
+            if (existsSync(binPath)) {
+                launcherPath = binPath;
+            }
+        } catch (error) {
+            // If resolution fails, fall back to PATH
+            // This could happen in dev environments where pmxt-core is globally installed
+        }
+
         // Try to start the server using pmxt-ensure-server
         const { spawn } = await import("child_process");
 
         try {
-            const proc = spawn("pmxt-ensure-server", [], {
+            const proc = spawn(launcherPath, [], {
                 detached: true,
                 stdio: "ignore",
             });
@@ -84,3 +153,4 @@ export class ServerManager {
         }
     }
 }
+