gdharness 0.5.6 → 0.5.7

package/build/cli.js

@@ -34164,6 +34164,8 @@ var init_godot_bridge = __esm(() => {
         server.once("error", (error) => {
           if (!settled) {
             settled = true;
+            server.close();
+            godotWss.close();
             reject(error);
             return;
           }
@@ -35730,6 +35732,7 @@ class GodotServer {
   lspClient = null;
   dapClient = null;
   bridgeStartupError = null;
+  bridgeRetry = null;
   lastProjectPath = null;
   shutdownInitiated = false;
   constructor() {
@@ -35786,11 +35789,43 @@ class GodotServer {
       const reason = errorMessage(bridgeError);
       this.bridgeStartupError = code && !reason.includes(code) ? `${code}: ${reason}` : reason;
       console.error(`[SERVER] Warning: Godot Editor Bridge failed to start: ${this.bridgeStartupError}`);
-      console.error("[SERVER] Continuing without bridge-backed editor tools.");
+      console.error("[SERVER] Continuing without bridge-backed editor tools, and trying again.");
+      this.keepTryingTheBridge();
+    }
+  }
+  keepTryingTheBridge() {
+    if (this.bridgeRetry !== null || this.shutdownInitiated) {
+      return;
+    }
+    this.bridgeRetry = setInterval(() => {
+      this.tryTheBridgeAgain();
+    }, BRIDGE_RETRY_MS);
+    this.bridgeRetry.unref();
+  }
+  async tryTheBridgeAgain() {
+    if (this.shutdownInitiated) {
+      this.stopTryingTheBridge();
+      return;
+    }
+    try {
+      await this.godotBridge.start();
+    } catch {
+      return;
+    }
+    this.bridgeStartupError = null;
+    this.stopTryingTheBridge();
+    const bridgeStatus = this.godotBridge.getStatus();
+    console.error(`[SERVER] Godot Editor Bridge came up on ${bridgeStatus.host}:${bridgeStatus.port}; editor tools are live.`);
+  }
+  stopTryingTheBridge() {
+    if (this.bridgeRetry !== null) {
+      clearInterval(this.bridgeRetry);
+      this.bridgeRetry = null;
     }
   }
   async cleanup() {
     this.logDebug("Cleaning up resources");
+    this.stopTryingTheBridge();
     if (this.activeProcess) {
       this.activeProcess.process?.kill();
       this.activeProcess = null;
@@ -36612,8 +36647,9 @@ class GodotServer {
       bridgeAvailable: this.bridgeStartupError === null,
       startupError: this.bridgeStartupError,
       staleNote: stale ? addonMismatch(status.addonVersion, SERVER_VERSION) : undefined,
-      note: isPortConflict ? "Bridge port is already in use. Another gdharness instance may own the editor bridge, so this server cannot report that editor connection." : undefined,
-      suggestion: isPortConflict ? "Stop duplicate gdharness/MCP server instances or re-run the command from the same server process that owns the bridge port." : undefined
+      retryingBridge: this.bridgeRetry === null ? undefined : true,
+      note: isPortConflict ? "Bridge port is already in use. Another gdharness instance owns the editor bridge, so this server cannot reach the editor. Usually the server this one replaced, still on its way out." : undefined,
+      suggestion: isPortConflict ? `This server is asking for the port again every ${BRIDGE_RETRY_MS / 1000}s and takes it the moment the other one lets go, so editor tools come back on their own. Ask again, or end the older gdharness process to have it now.` : undefined
     };
   }
   async editorPlayingState() {
@@ -37091,7 +37127,7 @@ async function runGodotServer() {
   const server = new GodotServer;
   await server.run();
 }
-var UPDATE_NOTICE_EVERY = 500, FEEDBACK_NOTICE_EVERY = 250, run5, __dirname2, EDITOR_RESTART_TIMEOUT_MS = 90000, PATH_SOLUTIONS, PROJECT_FILE_ARGUMENTS, DEBUG_STATE_CALLS, HEADLESS_OPERATIONS, PROJECT_INFO_SECTIONS;
+var UPDATE_NOTICE_EVERY = 500, FEEDBACK_NOTICE_EVERY = 250, run5, __dirname2, EDITOR_RESTART_TIMEOUT_MS = 90000, BRIDGE_RETRY_MS = 2000, PATH_SOLUTIONS, PROJECT_FILE_ARGUMENTS, DEBUG_STATE_CALLS, HEADLESS_OPERATIONS, PROJECT_INFO_SECTIONS;
 var init_server3 = __esm(() => {
   init_mcp();
   init_stdio2();

package/build/index.js

@@ -25468,6 +25468,8 @@ class GodotBridge extends EventEmitter {
       server.once("error", (error) => {
         if (!settled) {
           settled = true;
+          server.close();
+          godotWss.close();
           reject(error);
           return;
         }
@@ -28405,6 +28407,7 @@ var FEEDBACK_NOTICE_EVERY = 250;
 var run3 = promisify3(execFile3);
 var __dirname2 = dirname2(fileURLToPath2(import.meta.url));
 var EDITOR_RESTART_TIMEOUT_MS = 90000;
+var BRIDGE_RETRY_MS = 2000;
 var PATH_SOLUTIONS = [
   'Give the path relative to the project, such as "scenes/main.tscn" or "res://scenes/main.tscn"',
   "Point projectPath at the project the file belongs to"
@@ -28511,6 +28514,7 @@ class GodotServer {
   lspClient = null;
   dapClient = null;
   bridgeStartupError = null;
+  bridgeRetry = null;
   lastProjectPath = null;
   shutdownInitiated = false;
   constructor() {
@@ -28567,11 +28571,43 @@ class GodotServer {
       const reason = errorMessage(bridgeError);
       this.bridgeStartupError = code && !reason.includes(code) ? `${code}: ${reason}` : reason;
       console.error(`[SERVER] Warning: Godot Editor Bridge failed to start: ${this.bridgeStartupError}`);
-      console.error("[SERVER] Continuing without bridge-backed editor tools.");
+      console.error("[SERVER] Continuing without bridge-backed editor tools, and trying again.");
+      this.keepTryingTheBridge();
+    }
+  }
+  keepTryingTheBridge() {
+    if (this.bridgeRetry !== null || this.shutdownInitiated) {
+      return;
+    }
+    this.bridgeRetry = setInterval(() => {
+      this.tryTheBridgeAgain();
+    }, BRIDGE_RETRY_MS);
+    this.bridgeRetry.unref();
+  }
+  async tryTheBridgeAgain() {
+    if (this.shutdownInitiated) {
+      this.stopTryingTheBridge();
+      return;
+    }
+    try {
+      await this.godotBridge.start();
+    } catch {
+      return;
+    }
+    this.bridgeStartupError = null;
+    this.stopTryingTheBridge();
+    const bridgeStatus = this.godotBridge.getStatus();
+    console.error(`[SERVER] Godot Editor Bridge came up on ${bridgeStatus.host}:${bridgeStatus.port}; editor tools are live.`);
+  }
+  stopTryingTheBridge() {
+    if (this.bridgeRetry !== null) {
+      clearInterval(this.bridgeRetry);
+      this.bridgeRetry = null;
     }
   }
   async cleanup() {
     this.logDebug("Cleaning up resources");
+    this.stopTryingTheBridge();
     if (this.activeProcess) {
       this.activeProcess.process?.kill();
       this.activeProcess = null;
@@ -29393,8 +29429,9 @@ class GodotServer {
       bridgeAvailable: this.bridgeStartupError === null,
       startupError: this.bridgeStartupError,
       staleNote: stale ? addonMismatch(status.addonVersion, SERVER_VERSION) : undefined,
-      note: isPortConflict ? "Bridge port is already in use. Another gdharness instance may own the editor bridge, so this server cannot report that editor connection." : undefined,
-      suggestion: isPortConflict ? "Stop duplicate gdharness/MCP server instances or re-run the command from the same server process that owns the bridge port." : undefined
+      retryingBridge: this.bridgeRetry === null ? undefined : true,
+      note: isPortConflict ? "Bridge port is already in use. Another gdharness instance owns the editor bridge, so this server cannot reach the editor. Usually the server this one replaced, still on its way out." : undefined,
+      suggestion: isPortConflict ? `This server is asking for the port again every ${BRIDGE_RETRY_MS / 1000}s and takes it the moment the other one lets go, so editor tools come back on their own. Ask again, or end the older gdharness process to have it now.` : undefined
     };
   }
   async editorPlayingState() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdharness",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "mcpName": "io.github.Aureliolo/gdharness",
   "description": "A harness for driving a Godot 4 project from an agent: editor addons, a runtime bridge into the running game, an MCP server in front of them, and a CLI that installs and diagnoses the Godot side.",
   "type": "module",