gdharness 0.5.8 → 0.5.9

package/build/cli.js

@@ -30646,6 +30646,47 @@ var init_stdio2 = __esm(() => {
   init_stdio();
 });
 
+// src/bridge-announce.ts
+import { mkdirSync as mkdirSync5, rmSync as rmSync6, writeFileSync as writeFileSync7 } from "node:fs";
+import { dirname as dirname6, join as join11 } from "node:path";
+function announcementPath(projectPath) {
+  return join11(projectPath, ".godot", "gdharness-bridge.json");
+}
+function announceBridge(projectPath, bridge) {
+  const path = announcementPath(projectPath);
+  try {
+    mkdirSync5(dirname6(path), { recursive: true });
+    const announcement = {
+      protocol: BRIDGE_ANNOUNCE_PROTOCOL,
+      host: bridge.host,
+      port: bridge.port,
+      pid: process.pid,
+      version: bridge.version,
+      startedAt: new Date().toISOString()
+    };
+    writeFileSync7(path, `${JSON.stringify(announcement, null, 2)}
+`, "utf8");
+    return path;
+  } catch (error) {
+    console.error(`[SERVER] Could not announce the editor bridge at ${path}: ${errorMessage(error)}`);
+    return null;
+  }
+}
+function withdrawBridge(path) {
+  if (path === null) {
+    return;
+  }
+  try {
+    rmSync6(path, { force: true });
+  } catch (error) {
+    console.error(`[SERVER] Could not withdraw the editor bridge announcement: ${errorMessage(error)}`);
+  }
+}
+var BRIDGE_ANNOUNCE_PROTOCOL = 1;
+var init_bridge_announce = __esm(() => {
+  init_errors();
+});
+
 // src/framing.ts
 function frame(message) {
   const body = Buffer.from(JSON.stringify(message), "utf8");
@@ -34113,8 +34154,8 @@ function resolveDefaultBridgeHost() {
   const host = process.env["GDHARNESS_BRIDGE_HOST"]?.trim();
   return host === undefined || host === "" ? DEFAULT_HOST : host;
 }
-function getDefaultBridge() {
-  defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost());
+function getDefaultBridge(mayMove = false) {
+  defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost(), DEFAULT_TIMEOUT_MS, mayMove);
   return defaultBridge;
 }
 var DEFAULT_PORT = 6505, DEFAULT_HOST = "127.0.0.1", DEFAULT_TIMEOUT_MS = 30000, KEEPALIVE_INTERVAL_MS = 1e4, SECOND_CONNECTION_CLOSE_CODE = 4000, GodotBridge, defaultBridge = null;
@@ -34130,19 +34171,37 @@ var init_godot_bridge = __esm(() => {
     connectionInfo = null;
     pendingRequests = new Map;
     resourceQueues = new Map;
-    port;
+    wantedPort;
+    boundPort = null;
     host;
     timeoutMs;
-    constructor(port = DEFAULT_PORT, host = DEFAULT_HOST, timeoutMs = DEFAULT_TIMEOUT_MS) {
+    mayMove;
+    constructor(port = DEFAULT_PORT, host = DEFAULT_HOST, timeoutMs = DEFAULT_TIMEOUT_MS, mayMove = false) {
       super();
-      this.port = port;
+      this.wantedPort = port;
       this.host = host;
       this.timeoutMs = timeoutMs;
+      this.mayMove = mayMove;
+    }
+    get port() {
+      return this.boundPort ?? this.wantedPort;
     }
-    start() {
+    async start() {
       if (this.httpServer) {
-        return Promise.resolve();
+        return;
+      }
+      try {
+        await this.listenOn(this.wantedPort);
+      } catch (error) {
+        const held = error instanceof Error && "code" in error && error.code === "EADDRINUSE";
+        if (!held || !this.mayMove) {
+          throw error;
+        }
+        this.log("warn", `Editor bridge port ${this.wantedPort} is held; taking another one.`);
+        await this.listenOn(0);
       }
+    }
+    listenOn(port) {
       return new Promise((resolve, reject) => {
         const server = http.createServer((_req, res) => {
           res.writeHead(404);
@@ -34166,6 +34225,8 @@ var init_godot_bridge = __esm(() => {
           settled = true;
           this.httpServer = server;
           this.godotWss = godotWss;
+          const bound = server.address();
+          this.boundPort = typeof bound === "object" && bound !== null ? bound.port : port;
           this.log("info", `Editor bridge listening on ${this.host}:${this.port}`);
           resolve();
         });
@@ -34182,7 +34243,7 @@ var init_godot_bridge = __esm(() => {
         godotWss.on("error", (error) => {
           this.log("error", `Godot WebSocket server error: ${error.message}`);
         });
-        server.listen(this.port, this.host);
+        server.listen(port, this.host);
       });
     }
     async stop() {
@@ -34216,6 +34277,7 @@ var init_godot_bridge = __esm(() => {
         this.httpServer = null;
       }
       await Promise.all(closeTasks);
+      this.boundPort = null;
       this.connectionInfo = null;
       this.log("info", "WebSocket bridge stopped");
     }
@@ -34865,7 +34927,7 @@ var init_junit = __esm(() => {
 import { realpathSync } from "node:fs";
 import { readFile, realpath } from "node:fs/promises";
 import { createConnection as createConnection2 } from "node:net";
-import { dirname as dirname6, resolve as resolve3 } from "node:path";
+import { dirname as dirname7, resolve as resolve3 } from "node:path";
 import { fileURLToPath as fileURLToPath3, pathToFileURL } from "node:url";
 function diagnosticsKey(uri) {
   let decoded;
@@ -34991,7 +35053,7 @@ class GodotLSPClient {
     if (this.initialized) {
       return;
     }
-    const rootPath = this.rootPath ?? dirname6(resolve3(filePath));
+    const rootPath = this.rootPath ?? dirname7(resolve3(filePath));
     await this.initialize(rootPath);
   }
   async sendRequest(method, params) {
@@ -35366,7 +35428,7 @@ var init_lsp_client = __esm(() => {
 
 // src/project-scan.ts
 import { readdirSync as readdirSync4, readFileSync as readFileSync9 } from "node:fs";
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 function projectStructure(projectPath) {
   const structure = { scenes: 0, scripts: 0, assets: 0, other: 0 };
   const visit = (directory) => {
@@ -35375,7 +35437,7 @@ function projectStructure(projectPath) {
         continue;
       }
       if (entry.isDirectory()) {
-        visit(join11(directory, entry.name));
+        visit(join12(directory, entry.name));
       } else if (entry.isFile()) {
         const extension = entry.name.split(".").pop()?.toLowerCase() ?? "";
         if (extension === "tscn") {
@@ -35417,7 +35479,7 @@ function searchProject(projectPath, options) {
       if (SKIPPED.has(entry.name)) {
         continue;
       }
-      const entryPath = join11(directory, entry.name);
+      const entryPath = join12(directory, entry.name);
       if (entry.isDirectory()) {
         visit(entryPath);
         continue;
@@ -35459,20 +35521,20 @@ var init_project_scan = __esm(() => {
 import { existsSync as existsSync10, readdirSync as readdirSync5, readFileSync as readFileSync10, unlinkSync } from "node:fs";
 import { createConnection as createConnection3 } from "node:net";
 import { tmpdir as tmpdir4 } from "node:os";
-import { join as join12, resolve as resolve4 } from "node:path";
+import { join as join13, resolve as resolve4 } from "node:path";
 function runtimeDirectory(variables = process.env) {
   const explicit = envValue("GDHARNESS_RUNTIME_DIR", variables);
   if (explicit) {
     return explicit;
   }
   const perUser = envValue("XDG_RUNTIME_DIR", variables);
-  return join12(perUser ?? tmpdir4(), "gdharness");
+  return join13(perUser ?? tmpdir4(), "gdharness");
 }
 function runtimeDirectories(variables = process.env) {
   const candidates = [runtimeDirectory(variables)];
   const fallbacks = process.platform === "win32" ? [envValue("SystemRoot", variables) ?? envValue("windir", variables) ?? "C:\\Windows"] : ["/tmp", "/var/tmp"];
   for (const base of fallbacks) {
-    candidates.push(join12(base, process.platform === "win32" ? "Temp" : "", "gdharness"));
+    candidates.push(join13(base, process.platform === "win32" ? "Temp" : "", "gdharness"));
   }
   return [...new Set(candidates.map((path) => resolve4(path)))];
 }
@@ -35535,7 +35597,7 @@ function announcedIn(directory) {
     if (!match) {
       continue;
     }
-    const file = join12(directory, entry);
+    const file = join13(directory, entry);
     const pid = Number.parseInt(match[1] ?? "", 10);
     const announced = processAlive(pid) ? parseAnnouncement(file, pid) : { kind: "rubbish" };
     if (announced.kind === "rubbish") {
@@ -35681,9 +35743,9 @@ var init_runtime_client = __esm(() => {
 
 // src/server.ts
 import { execFile as execFile5, spawn } from "node:child_process";
-import { existsSync as existsSync11, mkdtempSync as mkdtempSync3, readdirSync as readdirSync6, readFileSync as readFileSync11, realpathSync as realpathSync2, rmSync as rmSync6 } from "node:fs";
+import { existsSync as existsSync11, mkdtempSync as mkdtempSync3, readdirSync as readdirSync6, readFileSync as readFileSync11, realpathSync as realpathSync2, rmSync as rmSync7 } from "node:fs";
 import { tmpdir as tmpdir5 } from "node:os";
-import { basename as basename2, dirname as dirname7, join as join13, normalize as normalize3 } from "node:path";
+import { basename as basename2, dirname as dirname8, join as join14, normalize as normalize3 } from "node:path";
 import { setTimeout as delay2 } from "node:timers/promises";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { promisify as promisify5 } from "node:util";
@@ -35729,7 +35791,7 @@ function camelCased(params) {
 class GodotServer {
   mcp;
   locator = new GodotLocator2;
-  operationsScript = join13(__dirname2, "godot", "operations", "godot_operations.gd");
+  operationsScript = join14(__dirname2, "godot", "operations", "godot_operations.gd");
   godotBridge;
   tools = buildToolDefinitions();
   activeProcess = null;
@@ -35743,8 +35805,11 @@ class GodotServer {
   bridgeRetry = null;
   lastProjectPath = null;
   shutdownInitiated = false;
+  ownProject;
+  announcedAt = null;
   constructor() {
-    this.godotBridge = getDefaultBridge();
+    this.ownProject = envValue("GDHARNESS_PROJECT") ?? null;
+    this.godotBridge = getDefaultBridge(this.ownProject !== null);
     this.mcp = new McpServer({ name: "gdharness", version: SERVER_VERSION }, { capabilities: { tools: {}, resources: {} } });
     this.setupToolHandlers();
     setupResourceHandlers(this.mcp, () => this.lastProjectPath);
@@ -35792,6 +35857,7 @@ class GodotServer {
       this.bridgeStartupError = null;
       const bridgeStatus = this.godotBridge.getStatus();
       console.error(`[SERVER] Godot Editor Bridge started on ${bridgeStatus.host}:${bridgeStatus.port}`);
+      this.announceTheBridge();
     } catch (bridgeError) {
       const code = bridgeError instanceof Error && "code" in bridgeError && typeof bridgeError.code === "string" ? bridgeError.code : null;
       const reason = errorMessage(bridgeError);
@@ -35824,6 +35890,18 @@ class GodotServer {
     this.stopTryingTheBridge();
     const bridgeStatus = this.godotBridge.getStatus();
     console.error(`[SERVER] Godot Editor Bridge came up on ${bridgeStatus.host}:${bridgeStatus.port}; editor tools are live.`);
+    this.announceTheBridge();
+  }
+  announceTheBridge() {
+    if (this.ownProject === null) {
+      return;
+    }
+    const status = this.godotBridge.getStatus();
+    this.announcedAt = announceBridge(this.ownProject, {
+      host: status.host,
+      port: status.port,
+      version: SERVER_VERSION
+    });
   }
   stopTryingTheBridge() {
     if (this.bridgeRetry !== null) {
@@ -35834,6 +35912,8 @@ class GodotServer {
   async cleanup() {
     this.logDebug("Cleaning up resources");
     this.stopTryingTheBridge();
+    withdrawBridge(this.announcedAt);
+    this.announcedAt = null;
     if (this.activeProcess) {
       this.activeProcess.process?.kill();
       this.activeProcess = null;
@@ -36216,7 +36296,7 @@ class GodotServer {
     if (path === undefined) {
       return { ok: false, response: this.createErrorResponse("projectPath is required.") };
     }
-    const file = join13(path, "project.godot");
+    const file = join14(path, "project.godot");
     if (!existsSync11(file)) {
       return {
         ok: false,
@@ -36481,7 +36561,7 @@ class GodotServer {
       return contained.response;
     }
     const runner = "addons/gdUnit4/bin/GdUnitCmdTool.gd";
-    if (!existsSync11(join13(project.value.path, runner))) {
+    if (!existsSync11(join14(project.value.path, runner))) {
       return this.createErrorResponse(`gdUnit4 is not installed in this project: no ${runner}.`, [
         "Install gdUnit4 under addons/gdUnit4, from https://github.com/godot-gdunit-labs/gdUnit4"
       ]);
@@ -36514,7 +36594,7 @@ class GodotServer {
     ];
     const timeoutMs = readPositiveNumber(args, "timeoutMs") ?? 600000;
     this.logDebug(`Running tests: ${engine.value} ${cmdArgs.join(" ")}`);
-    const userData = mkdtempSync3(join13(tmpdir5(), "gdharness-tests-"));
+    const userData = mkdtempSync3(join14(tmpdir5(), "gdharness-tests-"));
     const run = this.spawnGame(engine.value, cmdArgs, userDataIn(userData));
     const hung = await new Promise((resolve) => {
       const timer = setTimeout(() => {
@@ -36530,20 +36610,20 @@ class GodotServer {
         resolve(false);
       });
     });
-    const reportsDir = join13(project.value.path, ".godot", "gdharness-reports");
+    const reportsDir = join14(project.value.path, ".godot", "gdharness-reports");
     let report = null;
     let reportProblem = null;
     try {
       const written = existsSync11(reportsDir) ? readdirSync6(reportsDir).filter((name) => name.startsWith("report_")).sort((a, b) => Number(a.slice("report_".length)) - Number(b.slice("report_".length))) : [];
       const newest = written.at(-1);
       if (newest !== undefined) {
-        report = parseJUnit(readFileSync11(join13(reportsDir, newest, "results.xml"), "utf8"));
+        report = parseJUnit(readFileSync11(join14(reportsDir, newest, "results.xml"), "utf8"));
       }
     } catch (error) {
       reportProblem = errorMessage(error);
     } finally {
-      rmSync6(reportsDir, { recursive: true, force: true });
-      rmSync6(userData, { recursive: true, force: true });
+      rmSync7(reportsDir, { recursive: true, force: true });
+      rmSync7(userData, { recursive: true, force: true });
     }
     const engineEntries = run.log.select({ severity: "warning", sinceLastCall: false, limit: 200 }).entries;
     const verdicts = {
@@ -36656,6 +36736,7 @@ class GodotServer {
       startupError: this.bridgeStartupError,
       staleNote: stale ? addonMismatch(status.addonVersion, SERVER_VERSION) : undefined,
       retryingBridge: this.bridgeRetry === null ? undefined : true,
+      announcedAt: this.announcedAt ?? undefined,
       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
     };
@@ -37051,8 +37132,8 @@ class GodotServer {
       return this.createErrorResponse(choice.problem);
     }
     const expectsScreenshot = command === "capture_screenshot" || command === "capture_viewport";
-    const screenshotDir = expectsScreenshot ? mkdtempSync3(join13(tmpdir5(), "gdharness-runtime-screenshot-")) : null;
-    const screenshotPath = screenshotDir ? join13(screenshotDir, "capture.png") : null;
+    const screenshotDir = expectsScreenshot ? mkdtempSync3(join14(tmpdir5(), "gdharness-runtime-screenshot-")) : null;
+    const screenshotPath = screenshotDir ? join14(screenshotDir, "capture.png") : null;
     try {
       const reply = await runtimeRequest(choice.endpoint, command, screenshotPath ? { ...params, output_path: screenshotPath } : params, timeoutMs);
       if (!reply.ok) {
@@ -37078,7 +37159,7 @@ class GodotServer {
       };
     } finally {
       if (screenshotDir) {
-        rmSync6(screenshotDir, { recursive: true, force: true });
+        rmSync7(screenshotDir, { recursive: true, force: true });
       }
     }
   }
@@ -37140,6 +37221,7 @@ var init_server3 = __esm(() => {
   init_mcp();
   init_stdio2();
   init_types();
+  init_bridge_announce();
   init_class_cache();
   init_dap_client();
   init_errors();
@@ -37158,7 +37240,7 @@ var init_server3 = __esm(() => {
   init_tool_definitions();
   init_update_check();
   run5 = promisify5(execFile5);
-  __dirname2 = dirname7(fileURLToPath4(import.meta.url));
+  __dirname2 = dirname8(fileURLToPath4(import.meta.url));
   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"
@@ -37216,7 +37298,7 @@ var init_server3 = __esm(() => {
 
 // src/cli.ts
 import { existsSync as existsSync12 } from "fs";
-import { join as join14, resolve as resolve5 } from "path";
+import { join as join15, resolve as resolve5 } from "path";
 
 // src/errors.ts
 class Refusal extends Error {
@@ -37426,9 +37508,13 @@ function isEmptyCollection(node) {
 init_errors();
 init_runner();
 var SERVER_KEY = "gdharness";
-function launchFor(version, godotPath, runner = currentRunner()) {
+function launchFor(version, godotPath, projectPath, runner = currentRunner()) {
   const spawn = spawnFor(runner, version);
-  return { command: spawn.command, args: spawn.args, env: { GODOT_PATH: godotPath } };
+  return {
+    command: spawn.command,
+    args: spawn.args,
+    env: { GODOT_PATH: godotPath, GDHARNESS_PROJECT: projectPath }
+  };
 }
 function tomlArray(values) {
   return `[${values.map((value) => `"${value}"`).join(", ")}]`;
@@ -38614,7 +38700,7 @@ class UsageError extends Refusal {
 function projectArgument(at) {
   const named = args.slice(at).find((value) => !value.startsWith("--"));
   const projectPath = resolve5(named ?? ".");
-  if (!existsSync12(join14(projectPath, "project.godot"))) {
+  if (!existsSync12(join15(projectPath, "project.godot"))) {
     throw new UsageError(`Not a Godot project: ${projectPath} holds no project.godot.`);
   }
   return projectPath;
@@ -38740,7 +38826,7 @@ async function setup() {
     console.log(`class list rebuilt: ${String(classes.payload["classes"])} classes`);
   }
   if (!args.includes("--no-connect")) {
-    const launch = launchFor(getLocalVersion(), godot.godotPath);
+    const launch = launchFor(getLocalVersion(), godot.godotPath, projectPath);
     const ask = new Ask;
     let chosen;
     try {
@@ -38835,7 +38921,7 @@ async function upgrade() {
     said(await setRuntime(godot, projectPath, true), "registering the runtime autoload");
   }
   said(await runOperation(godot, "refresh_class_cache", {}, projectPath), "rebuilding the class list");
-  const launch = launchFor(version, godot.godotPath);
+  const launch = launchFor(version, godot.godotPath, projectPath);
   const already = HARNESSES.filter((harness) => registered(harness, projectPath));
   for (const group of groupByFile(already, projectPath)) {
     reportConnection(group, launch, projectPath);

package/build/godot/addons/gdharness_editor/bridge_client.gd

@@ -11,11 +11,34 @@ signal tool_requested(request_id: String, tool_name: String, args: Dictionary)
 const DEFAULT_URL: String = "ws://127.0.0.1:6505/godot"
 ## Written beside the addon by the install, so it names the version this copy came from.
 const VERSION_MARKER: String = "res://addons/gdharness_editor/.gdharness-version"
+## Written by the server that serves this project, saying where its bridge actually is. Kept in
+## step with `announcementPath` in src/bridge-announce.ts.
+const ANNOUNCEMENT: String = "res://.godot/gdharness-bridge.json"
+const ANNOUNCE_PROTOCOL: int = 1
 const RECONNECT_DELAY: float = 3.0
 const MAX_RECONNECT_DELAY: float = 30.0
 
+## How long one attempt is given before the address is called a bad one.
+##
+## A socket pointed at a port nothing holds gives up by itself, in thirty seconds on Windows. One
+## pointed at something that accepts and then never speaks WebSocket does not give up at all:
+## measured here, still connecting after forty-five seconds, because the peer has no handshake
+## timeout of its own in 4.7. A leftover announcement can be either, and a port that has been
+## reused by some other program is the second.
+const CONNECT_TIMEOUT: float = 10.0
+
+## How often the announcement is read again while connected, so a newer server is moved to
+## rather than waited for. A harness reconnect leaves the server it replaced running and holding
+## the old port, and an editor with no reason to look elsewhere stayed on it for the session.
+const FOLLOW_INTERVAL: float = 5.0
+
 var socket: WebSocketPeer = WebSocketPeer.new()
 var server_url: String = DEFAULT_URL
+
+## What this copy was when it loaded, which is what the editor is running until it is restarted.
+## See [method _loaded_version] for why it is held rather than read when it is wanted.
+var version_at_load: String = ""
+
 var _is_connected: bool = false
 var _reconnect_timer: Timer
 var _current_reconnect_delay: float = RECONNECT_DELAY
@@ -24,9 +47,21 @@ var _should_reconnect: bool = false
 var _project_path: String
 var _initialized: bool = false
 
+## Whether the address came from a caller rather than from the project, in which case it is not
+## this node's to change.
+var _named_by_caller: bool = false
+var _since_looked: float = 0.0
+
+## The announced address that did not answer, so the fallback gets a turn. Cleared the moment
+## anything connects or the project names a different one.
+var _refused_url: String = ""
+var _tried_announced: bool = false
+var _connecting_for: float = 0.0
+
 
 func _ready() -> void:
 	_project_path = ProjectSettings.globalize_path("res://")
+	version_at_load = _loaded_version()
 
 	_reconnect_timer = Timer.new()
 	_reconnect_timer.one_shot = true
@@ -48,6 +83,8 @@ func _process(_delta: float) -> void:
 			# A connection refused never opened, so it reaches CLOSED without passing through
 			# _handle_disconnect and nothing would ask again. An editor opened before the server
 			# is the ordinary way that happens, and it then sat there for the rest of the day.
+			if _tried_announced:
+				_refused_url = server_url
 			_schedule_reconnect()
 		return
 
@@ -57,11 +94,17 @@ func _process(_delta: float) -> void:
 		WebSocketPeer.STATE_OPEN:
 			if not _is_connected:
 				_handle_connect()
+			_follow_whoever_is_newest(_delta)
 
 			while socket.get_available_packet_count() > 0:
 				var packet: PackedByteArray = socket.get_packet()
 				_handle_message(packet.get_string_from_utf8())
 
+		WebSocketPeer.STATE_CONNECTING:
+			_connecting_for += _delta
+			if _connecting_for >= CONNECT_TIMEOUT:
+				_give_up_on_this_address()
+
 		WebSocketPeer.STATE_CLOSING:
 			pass
 
@@ -70,7 +113,38 @@ func _process(_delta: float) -> void:
 				_handle_disconnect()
 
 
+## Moves to the server the project now names, when that is not the one this is talking to.
+##
+## A harness reconnect leaves the server it replaced running, still holding the port it bound and
+## still answering: the editor has no reason to notice, and stayed on a server nothing was
+## speaking to for the rest of the session. The replacement announces where it landed, so the
+## editor can go to it rather than anybody ending a process.
+##
+## Only while connected by a URL this worked out for itself. A caller that named one is holding
+## this to that address, which is what every fixture does.
+func _follow_whoever_is_newest(delta: float) -> void:
+	if _named_by_caller:
+		return
+	_since_looked += delta
+	if _since_looked < FOLLOW_INTERVAL:
+		return
+	_since_looked = 0.0
+
+	var announced: String = announced_url()
+	if announced == "" or announced == server_url or announced == _refused_url:
+		return
+	server_url = announced
+	# Put down before it is picked up again, because the arrival is what tells a server who this
+	# editor is: left standing, the open socket on the new address would never be greeted and the
+	# server would report no editor while holding one.
+	_is_connected = false
+	disconnected.emit()
+	_current_reconnect_delay = RECONNECT_DELAY
+	_attempt_connection()
+
+
 func connect_to_server(url: String = "") -> void:
+	_named_by_caller = url != ""
 	server_url = _resolve_server_url(url)
 	_should_reconnect = true
 	_current_reconnect_delay = RECONNECT_DELAY
@@ -81,6 +155,12 @@ func _resolve_server_url(explicit_url: String) -> String:
 	if explicit_url != "":
 		return explicit_url
 
+	var announced: String = announced_url()
+	if announced != "" and announced != _refused_url:
+		_tried_announced = true
+		return announced
+	_tried_announced = false
+
 	# The same variable the server reads, so the two agree on the port by construction.
 	var raw: String = OS.get_environment("GDHARNESS_BRIDGE_PORT")
 	if raw != "":
@@ -91,6 +171,48 @@ func _resolve_server_url(explicit_url: String) -> String:
 	return DEFAULT_URL
 
 
+## Stops waiting on an address that is not answering, and asks again elsewhere.
+func _give_up_on_this_address() -> void:
+	if _tried_announced:
+		_refused_url = server_url
+	_connecting_for = 0.0
+	socket.close()
+	_schedule_reconnect()
+
+
+## Where the server says its bridge is, or "" when nothing has said.
+##
+## Written by a server that knows which project it serves, inside that project, so the two sides
+## agree by construction rather than by deriving a temporary directory the same way: they do not
+## share an environment, and the runtime's own announcement cost a session learning that.
+##
+## A leftover is found out by trying it rather than by asking whether its process is still there.
+## `OS.is_process_running` answers that only for a child of the caller on Unix, where it prints
+## "does not exist or is not a child of the calling process" and says no about every server there
+## is: it works on Windows and quietly disables the whole thing everywhere else. So an
+## announcement that does not answer is set aside, the fallback gets the next turn, and a
+## different announcement puts it back in play.
+func announced_url() -> String:
+	if not FileAccess.file_exists(ANNOUNCEMENT):
+		return ""
+	var file: FileAccess = FileAccess.open(ANNOUNCEMENT, FileAccess.READ)
+	if file == null:
+		return ""
+	var said: Variant = JSON.parse_string(file.get_as_text())
+	file.close()
+	if not said is Dictionary:
+		return ""
+
+	var announcement: Dictionary = said
+	if int(announcement.get("protocol", 0)) != ANNOUNCE_PROTOCOL:
+		return ""
+	var port: int = int(announcement.get("port", 0))
+	if port < 1 or port > 65535:
+		return ""
+	var host: String = str(announcement.get("host", "127.0.0.1"))
+	return "ws://%s:%d/godot" % [host, port]
+
+
 func disconnect_from_server() -> void:
 	_should_reconnect = false
 	if _reconnect_timer:
@@ -104,6 +226,7 @@ func _attempt_connection() -> void:
 	if socket.get_ready_state() != WebSocketPeer.STATE_CLOSED:
 		socket.close()
 
+	_connecting_for = 0.0
 	var err: Error = socket.connect_to_url(server_url)
 	if err != OK:
 		push_error("[gdharness] Failed to connect to %s: %s" % [server_url, error_string(err)])
@@ -113,6 +236,7 @@ func _attempt_connection() -> void:
 func _handle_connect() -> void:
 	_is_connected = true
 	_current_reconnect_delay = RECONNECT_DELAY
+	_refused_url = ""
 
 	# The version reported is the one this editor loaded at startup, not the one on disk: an
 	# upgrade replaces the files under a running editor, which goes on serving the old code until
@@ -123,7 +247,7 @@ func _handle_connect() -> void:
 		{
 			"type": "godot_ready",
 			"project_path": _project_path,
-			"addon_version": _loaded_version(),
+			"addon_version": version_at_load,
 			"editor_pid": OS.get_process_id()
 		}
 	)
@@ -132,6 +256,13 @@ func _handle_connect() -> void:
 
 
 ## The version marker beside this addon, or "" when the copy was not installed by gdharness.
+##
+## Read once, when this copy loads, and never again: an upgrade replaces the files under a
+## running editor and rewrites the marker with them, so reading it at connect time answers with
+## the version on disk rather than the one in memory. That is the wrong answer at the one moment
+## it matters. An upgrade ends with the harness reconnecting, the editor reconnecting behind it,
+## and `addonIsStale` reporting false over an editor still running the old code, which is exactly
+## what it exists to catch.
 func _loaded_version() -> String:
 	if not FileAccess.file_exists(VERSION_MARKER):
 		return ""
@@ -159,6 +290,10 @@ func _schedule_reconnect() -> void:
 
 
 func _on_reconnect_timer() -> void:
+	# Asked again rather than remembered: the reason a connection dropped is often that its server
+	# did, and the one that replaced it has said where it is since.
+	if not _named_by_caller:
+		server_url = _resolve_server_url("")
 	_attempt_connection()
 
 

package/build/index.js

@@ -10126,9 +10126,9 @@ function defectReport(where, error, godotVersion) {
 
 // src/server.ts
 import { execFile as execFile3, spawn } from "node:child_process";
-import { existsSync as existsSync6, mkdtempSync as mkdtempSync2, readdirSync as readdirSync5, readFileSync as readFileSync7, realpathSync as realpathSync2, rmSync as rmSync2 } from "node:fs";
+import { existsSync as existsSync6, mkdtempSync as mkdtempSync2, readdirSync as readdirSync5, readFileSync as readFileSync7, realpathSync as realpathSync2, rmSync as rmSync3 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
-import { basename, dirname as dirname2, join as join7, normalize as normalize2 } from "node:path";
+import { basename, dirname as dirname3, join as join8, normalize as normalize2 } from "node:path";
 import { setTimeout as delay2 } from "node:timers/promises";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { promisify as promisify3 } from "node:util";
@@ -24696,9 +24696,47 @@ class StdioServerTransport {
   }
 }
 
+// src/bridge-announce.ts
+import { mkdirSync as mkdirSync2, rmSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { dirname, join as join2 } from "node:path";
+function announcementPath(projectPath) {
+  return join2(projectPath, ".godot", "gdharness-bridge.json");
+}
+var BRIDGE_ANNOUNCE_PROTOCOL = 1;
+function announceBridge(projectPath, bridge) {
+  const path = announcementPath(projectPath);
+  try {
+    mkdirSync2(dirname(path), { recursive: true });
+    const announcement = {
+      protocol: BRIDGE_ANNOUNCE_PROTOCOL,
+      host: bridge.host,
+      port: bridge.port,
+      pid: process.pid,
+      version: bridge.version,
+      startedAt: new Date().toISOString()
+    };
+    writeFileSync2(path, `${JSON.stringify(announcement, null, 2)}
+`, "utf8");
+    return path;
+  } catch (error) {
+    console.error(`[SERVER] Could not announce the editor bridge at ${path}: ${errorMessage(error)}`);
+    return null;
+  }
+}
+function withdrawBridge(path) {
+  if (path === null) {
+    return;
+  }
+  try {
+    rmSync(path, { force: true });
+  } catch (error) {
+    console.error(`[SERVER] Could not withdraw the editor bridge announcement: ${errorMessage(error)}`);
+  }
+}
+
 // src/class-cache.ts
 import { existsSync as existsSync2, readdirSync, readFileSync as readFileSync3 } from "node:fs";
-import { join as join2 } from "node:path";
+import { join as join3 } from "node:path";
 function declaredClasses(projectPath) {
   const declared = new Map;
   const visit = (directory, prefix) => {
@@ -24706,7 +24744,7 @@ function declaredClasses(projectPath) {
       if (entry.name.startsWith(".")) {
         continue;
       }
-      const path = join2(directory, entry.name);
+      const path = join3(directory, entry.name);
       if (entry.isDirectory()) {
         visit(path, `${prefix}${entry.name}/`);
       } else if (entry.isFile() && entry.name.endsWith(".gd")) {
@@ -24721,7 +24759,7 @@ function declaredClasses(projectPath) {
   return declared;
 }
 function cachedClasses(projectPath) {
-  const cache = join2(projectPath, ".godot", "global_script_class_cache.cfg");
+  const cache = join3(projectPath, ".godot", "global_script_class_cache.cfg");
   if (!existsSync2(cache)) {
     return null;
   }
@@ -25426,19 +25464,37 @@ class GodotBridge extends EventEmitter {
   connectionInfo = null;
   pendingRequests = new Map;
   resourceQueues = new Map;
-  port;
+  wantedPort;
+  boundPort = null;
   host;
   timeoutMs;
-  constructor(port = DEFAULT_PORT, host = DEFAULT_HOST, timeoutMs = DEFAULT_TIMEOUT_MS) {
+  mayMove;
+  constructor(port = DEFAULT_PORT, host = DEFAULT_HOST, timeoutMs = DEFAULT_TIMEOUT_MS, mayMove = false) {
     super();
-    this.port = port;
+    this.wantedPort = port;
     this.host = host;
     this.timeoutMs = timeoutMs;
+    this.mayMove = mayMove;
+  }
+  get port() {
+    return this.boundPort ?? this.wantedPort;
   }
-  start() {
+  async start() {
     if (this.httpServer) {
-      return Promise.resolve();
+      return;
     }
+    try {
+      await this.listenOn(this.wantedPort);
+    } catch (error) {
+      const held = error instanceof Error && "code" in error && error.code === "EADDRINUSE";
+      if (!held || !this.mayMove) {
+        throw error;
+      }
+      this.log("warn", `Editor bridge port ${this.wantedPort} is held; taking another one.`);
+      await this.listenOn(0);
+    }
+  }
+  listenOn(port) {
     return new Promise((resolve, reject) => {
       const server = http.createServer((_req, res) => {
         res.writeHead(404);
@@ -25462,6 +25518,8 @@ class GodotBridge extends EventEmitter {
         settled = true;
         this.httpServer = server;
         this.godotWss = godotWss;
+        const bound = server.address();
+        this.boundPort = typeof bound === "object" && bound !== null ? bound.port : port;
         this.log("info", `Editor bridge listening on ${this.host}:${this.port}`);
         resolve();
       });
@@ -25478,7 +25536,7 @@ class GodotBridge extends EventEmitter {
       godotWss.on("error", (error) => {
         this.log("error", `Godot WebSocket server error: ${error.message}`);
       });
-      server.listen(this.port, this.host);
+      server.listen(port, this.host);
     });
   }
   async stop() {
@@ -25512,6 +25570,7 @@ class GodotBridge extends EventEmitter {
       this.httpServer = null;
     }
     await Promise.all(closeTasks);
+    this.boundPort = null;
     this.connectionInfo = null;
     this.log("info", "WebSocket bridge stopped");
   }
@@ -25813,8 +25872,8 @@ class GodotBridge extends EventEmitter {
   }
 }
 var defaultBridge = null;
-function getDefaultBridge() {
-  defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost());
+function getDefaultBridge(mayMove = false) {
+  defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost(), DEFAULT_TIMEOUT_MS, mayMove);
   return defaultBridge;
 }
 
@@ -25827,7 +25886,7 @@ import { promisify } from "node:util";
 // src/detection.ts
 import { existsSync as existsSync3, readdirSync as readdirSync2, statSync } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-import { join as join3 } from "node:path";
+import { join as join4 } from "node:path";
 function resolveHomeDirectory() {
   try {
     return homedir2();
@@ -25851,7 +25910,7 @@ function scanDirectoryForGodotBinaries(directory, platform) {
     if (!pattern.test(name)) {
       continue;
     }
-    const fullPath = join3(directory, name);
+    const fullPath = join4(directory, name);
     try {
       const stat = statSync(fullPath);
       if (stat.isFile()) {
@@ -25860,7 +25919,7 @@ function scanDirectoryForGodotBinaries(directory, platform) {
     } catch {}
   }
   matches.sort((a, b) => b.mtime - a.mtime);
-  return matches.map((m) => join3(directory, m.name));
+  return matches.map((m) => join4(directory, m.name));
 }
 function conventionalPaths(platform, home) {
   const paths = ["godot"];
@@ -26003,9 +26062,9 @@ class GodotLocator {
 
 // src/headless.ts
 import { execFile as execFile2 } from "node:child_process";
-import { mkdtempSync, rmSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { mkdtempSync, rmSync as rmSync2, writeFileSync as writeFileSync3 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import { join as join4 } from "node:path";
+import { join as join5 } from "node:path";
 import { promisify as promisify2 } from "node:util";
 var run2 = promisify2(execFile2);
 function snakeCased(params) {
@@ -26046,9 +26105,9 @@ function reason(stdout, stderr) {
   return stdout.trim().split(/\r?\n/).at(-1) ?? "no output at all";
 }
 async function runOperation(engine, operation, params, projectPath) {
-  const paramsDir = mkdtempSync(join4(tmpdir2(), "gdharness-params-"));
-  const paramsFile = join4(paramsDir, `${operation}.json`);
-  writeFileSync2(paramsFile, JSON.stringify(snakeCased(params)), "utf8");
+  const paramsDir = mkdtempSync(join5(tmpdir2(), "gdharness-params-"));
+  const paramsFile = join5(paramsDir, `${operation}.json`);
+  writeFileSync3(paramsFile, JSON.stringify(snakeCased(params)), "utf8");
   const args = [
     "--headless",
     "--path",
@@ -26078,7 +26137,7 @@ async function runOperation(engine, operation, params, projectPath) {
       messages: []
     };
   } finally {
-    rmSync(paramsDir, { recursive: true, force: true });
+    rmSync2(paramsDir, { recursive: true, force: true });
   }
   const payload = lastJsonObject(stdout);
   if (payload === null) {
@@ -26373,7 +26432,7 @@ function parseJUnit(xml) {
 import { realpathSync } from "node:fs";
 import { readFile, realpath } from "node:fs/promises";
 import { createConnection as createConnection2 } from "node:net";
-import { dirname, resolve as resolve2 } from "node:path";
+import { dirname as dirname2, resolve as resolve2 } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
 // src/paths.ts
@@ -26551,7 +26610,7 @@ class GodotLSPClient {
     if (this.initialized) {
       return;
     }
-    const rootPath = this.rootPath ?? dirname(resolve2(filePath));
+    const rootPath = this.rootPath ?? dirname2(resolve2(filePath));
     await this.initialize(rootPath);
   }
   async sendRequest(method, params) {
@@ -26919,7 +26978,7 @@ async function handleLSPTool(client, toolName, args) {
 
 // src/project-scan.ts
 import { readdirSync as readdirSync3, readFileSync as readFileSync4 } from "node:fs";
-import { join as join5 } from "node:path";
+import { join as join6 } from "node:path";
 var SKIPPED = new Set([".git", ".godot", ".import", "node_modules"]);
 var ASSET_EXTENSIONS = new Set(["png", "jpg", "jpeg", "webp", "svg", "ttf", "otf", "wav", "mp3", "ogg"]);
 function projectStructure(projectPath) {
@@ -26930,7 +26989,7 @@ function projectStructure(projectPath) {
         continue;
       }
       if (entry.isDirectory()) {
-        visit(join5(directory, entry.name));
+        visit(join6(directory, entry.name));
       } else if (entry.isFile()) {
         const extension = entry.name.split(".").pop()?.toLowerCase() ?? "";
         if (extension === "tscn") {
@@ -26972,7 +27031,7 @@ function searchProject(projectPath, options) {
       if (SKIPPED.has(entry.name)) {
         continue;
       }
-      const entryPath = join5(directory, entry.name);
+      const entryPath = join6(directory, entry.name);
       if (entry.isDirectory()) {
         visit(entryPath);
         continue;
@@ -27226,7 +27285,7 @@ function setupResourceHandlers(mcp, getProjectPath) {
 import { existsSync as existsSync5, readdirSync as readdirSync4, readFileSync as readFileSync6, unlinkSync } from "node:fs";
 import { createConnection as createConnection3 } from "node:net";
 import { tmpdir as tmpdir3 } from "node:os";
-import { join as join6, resolve as resolve4 } from "node:path";
+import { join as join7, resolve as resolve4 } from "node:path";
 
 // src/tool-args.ts
 function asParams(value) {
@@ -27288,13 +27347,13 @@ function runtimeDirectory(variables = process.env) {
     return explicit;
   }
   const perUser = envValue("XDG_RUNTIME_DIR", variables);
-  return join6(perUser ?? tmpdir3(), "gdharness");
+  return join7(perUser ?? tmpdir3(), "gdharness");
 }
 function runtimeDirectories(variables = process.env) {
   const candidates = [runtimeDirectory(variables)];
   const fallbacks = process.platform === "win32" ? [envValue("SystemRoot", variables) ?? envValue("windir", variables) ?? "C:\\Windows"] : ["/tmp", "/var/tmp"];
   for (const base of fallbacks) {
-    candidates.push(join6(base, process.platform === "win32" ? "Temp" : "", "gdharness"));
+    candidates.push(join7(base, process.platform === "win32" ? "Temp" : "", "gdharness"));
   }
   return [...new Set(candidates.map((path) => resolve4(path)))];
 }
@@ -27357,7 +27416,7 @@ function announcedIn(directory) {
     if (!match) {
       continue;
     }
-    const file = join6(directory, entry);
+    const file = join7(directory, entry);
     const pid = Number.parseInt(match[1] ?? "", 10);
     const announced = processAlive(pid) ? parseAnnouncement(file, pid) : { kind: "rubbish" };
     if (announced.kind === "rubbish") {
@@ -28413,7 +28472,7 @@ function buildToolDefinitions() {
 var UPDATE_NOTICE_EVERY = 500;
 var FEEDBACK_NOTICE_EVERY = 250;
 var run3 = promisify3(execFile3);
-var __dirname2 = dirname2(fileURLToPath2(import.meta.url));
+var __dirname2 = dirname3(fileURLToPath2(import.meta.url));
 var EDITOR_RESTART_TIMEOUT_MS = 90000;
 var BRIDGE_RETRY_MS = 2000;
 var PATH_SOLUTIONS = [
@@ -28511,7 +28570,7 @@ function camelCased(params) {
 class GodotServer {
   mcp;
   locator = new GodotLocator;
-  operationsScript = join7(__dirname2, "godot", "operations", "godot_operations.gd");
+  operationsScript = join8(__dirname2, "godot", "operations", "godot_operations.gd");
   godotBridge;
   tools = buildToolDefinitions();
   activeProcess = null;
@@ -28525,8 +28584,11 @@ class GodotServer {
   bridgeRetry = null;
   lastProjectPath = null;
   shutdownInitiated = false;
+  ownProject;
+  announcedAt = null;
   constructor() {
-    this.godotBridge = getDefaultBridge();
+    this.ownProject = envValue("GDHARNESS_PROJECT") ?? null;
+    this.godotBridge = getDefaultBridge(this.ownProject !== null);
     this.mcp = new McpServer({ name: "gdharness", version: SERVER_VERSION }, { capabilities: { tools: {}, resources: {} } });
     this.setupToolHandlers();
     setupResourceHandlers(this.mcp, () => this.lastProjectPath);
@@ -28574,6 +28636,7 @@ class GodotServer {
       this.bridgeStartupError = null;
       const bridgeStatus = this.godotBridge.getStatus();
       console.error(`[SERVER] Godot Editor Bridge started on ${bridgeStatus.host}:${bridgeStatus.port}`);
+      this.announceTheBridge();
     } catch (bridgeError) {
       const code = bridgeError instanceof Error && "code" in bridgeError && typeof bridgeError.code === "string" ? bridgeError.code : null;
       const reason = errorMessage(bridgeError);
@@ -28606,6 +28669,18 @@ class GodotServer {
     this.stopTryingTheBridge();
     const bridgeStatus = this.godotBridge.getStatus();
     console.error(`[SERVER] Godot Editor Bridge came up on ${bridgeStatus.host}:${bridgeStatus.port}; editor tools are live.`);
+    this.announceTheBridge();
+  }
+  announceTheBridge() {
+    if (this.ownProject === null) {
+      return;
+    }
+    const status = this.godotBridge.getStatus();
+    this.announcedAt = announceBridge(this.ownProject, {
+      host: status.host,
+      port: status.port,
+      version: SERVER_VERSION
+    });
   }
   stopTryingTheBridge() {
     if (this.bridgeRetry !== null) {
@@ -28616,6 +28691,8 @@ class GodotServer {
   async cleanup() {
     this.logDebug("Cleaning up resources");
     this.stopTryingTheBridge();
+    withdrawBridge(this.announcedAt);
+    this.announcedAt = null;
     if (this.activeProcess) {
       this.activeProcess.process?.kill();
       this.activeProcess = null;
@@ -28998,7 +29075,7 @@ class GodotServer {
     if (path === undefined) {
       return { ok: false, response: this.createErrorResponse("projectPath is required.") };
     }
-    const file = join7(path, "project.godot");
+    const file = join8(path, "project.godot");
     if (!existsSync6(file)) {
       return {
         ok: false,
@@ -29263,7 +29340,7 @@ class GodotServer {
       return contained.response;
     }
     const runner = "addons/gdUnit4/bin/GdUnitCmdTool.gd";
-    if (!existsSync6(join7(project.value.path, runner))) {
+    if (!existsSync6(join8(project.value.path, runner))) {
       return this.createErrorResponse(`gdUnit4 is not installed in this project: no ${runner}.`, [
         "Install gdUnit4 under addons/gdUnit4, from https://github.com/godot-gdunit-labs/gdUnit4"
       ]);
@@ -29296,7 +29373,7 @@ class GodotServer {
     ];
     const timeoutMs = readPositiveNumber(args, "timeoutMs") ?? 600000;
     this.logDebug(`Running tests: ${engine.value} ${cmdArgs.join(" ")}`);
-    const userData = mkdtempSync2(join7(tmpdir4(), "gdharness-tests-"));
+    const userData = mkdtempSync2(join8(tmpdir4(), "gdharness-tests-"));
     const run = this.spawnGame(engine.value, cmdArgs, userDataIn(userData));
     const hung = await new Promise((resolve) => {
       const timer = setTimeout(() => {
@@ -29312,20 +29389,20 @@ class GodotServer {
         resolve(false);
       });
     });
-    const reportsDir = join7(project.value.path, ".godot", "gdharness-reports");
+    const reportsDir = join8(project.value.path, ".godot", "gdharness-reports");
     let report = null;
     let reportProblem = null;
     try {
       const written = existsSync6(reportsDir) ? readdirSync5(reportsDir).filter((name) => name.startsWith("report_")).sort((a, b) => Number(a.slice("report_".length)) - Number(b.slice("report_".length))) : [];
       const newest = written.at(-1);
       if (newest !== undefined) {
-        report = parseJUnit(readFileSync7(join7(reportsDir, newest, "results.xml"), "utf8"));
+        report = parseJUnit(readFileSync7(join8(reportsDir, newest, "results.xml"), "utf8"));
       }
     } catch (error) {
       reportProblem = errorMessage(error);
     } finally {
-      rmSync2(reportsDir, { recursive: true, force: true });
-      rmSync2(userData, { recursive: true, force: true });
+      rmSync3(reportsDir, { recursive: true, force: true });
+      rmSync3(userData, { recursive: true, force: true });
     }
     const engineEntries = run.log.select({ severity: "warning", sinceLastCall: false, limit: 200 }).entries;
     const verdicts = {
@@ -29438,6 +29515,7 @@ class GodotServer {
       startupError: this.bridgeStartupError,
       staleNote: stale ? addonMismatch(status.addonVersion, SERVER_VERSION) : undefined,
       retryingBridge: this.bridgeRetry === null ? undefined : true,
+      announcedAt: this.announcedAt ?? undefined,
       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
     };
@@ -29833,8 +29911,8 @@ class GodotServer {
       return this.createErrorResponse(choice.problem);
     }
     const expectsScreenshot = command === "capture_screenshot" || command === "capture_viewport";
-    const screenshotDir = expectsScreenshot ? mkdtempSync2(join7(tmpdir4(), "gdharness-runtime-screenshot-")) : null;
-    const screenshotPath = screenshotDir ? join7(screenshotDir, "capture.png") : null;
+    const screenshotDir = expectsScreenshot ? mkdtempSync2(join8(tmpdir4(), "gdharness-runtime-screenshot-")) : null;
+    const screenshotPath = screenshotDir ? join8(screenshotDir, "capture.png") : null;
     try {
       const reply = await runtimeRequest(choice.endpoint, command, screenshotPath ? { ...params, output_path: screenshotPath } : params, timeoutMs);
       if (!reply.ok) {
@@ -29860,7 +29938,7 @@ class GodotServer {
       };
     } finally {
       if (screenshotDir) {
-        rmSync2(screenshotDir, { recursive: true, force: true });
+        rmSync3(screenshotDir, { recursive: true, force: true });
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdharness",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "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",