gdharness 0.9.1 → 0.9.3

package/build/index.js

@@ -10126,7 +10126,7 @@ function defectReport(where, error, godotVersion) {
 
 // src/server.ts
 import { execFile as execFile3, spawn } from "node:child_process";
-import { existsSync as existsSync7, mkdtempSync as mkdtempSync2, readdirSync as readdirSync5, readFileSync as readFileSync8, realpathSync as realpathSync2, rmSync as rmSync4 } from "node:fs";
+import { existsSync as existsSync7, mkdtempSync as mkdtempSync2, readdirSync as readdirSync5, readFileSync as readFileSync9, realpathSync as realpathSync2, rmSync as rmSync4 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
 import { basename, dirname as dirname4, join as join9, normalize as normalize2 } from "node:path";
 import { setTimeout as delay2 } from "node:timers/promises";
@@ -24697,12 +24697,30 @@ class StdioServerTransport {
 }
 
 // src/bridge-announce.ts
-import { mkdirSync as mkdirSync2, rmSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync3, 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 readAnnouncement(path) {
+  try {
+    const parsed = JSON.parse(readFileSync3(path, "utf8"));
+    if (typeof parsed !== "object" || parsed === null) {
+      return null;
+    }
+    const said = parsed;
+    if (typeof said.port !== "number" || typeof said.pid !== "number") {
+      return null;
+    }
+    return said;
+  } catch {
+    return null;
+  }
+}
+function announcementIsOurs(path) {
+  return readAnnouncement(path)?.pid === process.pid;
+}
 function announceBridge(projectPath, bridge) {
   const path = announcementPath(projectPath);
   try {
@@ -24724,7 +24742,7 @@ function announceBridge(projectPath, bridge) {
   }
 }
 function withdrawBridge(path) {
-  if (path === null) {
+  if (path === null || !announcementIsOurs(path)) {
     return;
   }
   try {
@@ -24735,7 +24753,7 @@ function withdrawBridge(path) {
 }
 
 // src/class-cache.ts
-import { existsSync as existsSync2, readdirSync, readFileSync as readFileSync3 } from "node:fs";
+import { existsSync as existsSync2, readdirSync, readFileSync as readFileSync4 } from "node:fs";
 import { join as join3 } from "node:path";
 function declaredClasses(projectPath) {
   const declared = new Map;
@@ -24748,7 +24766,7 @@ function declaredClasses(projectPath) {
       if (entry.isDirectory()) {
         visit(path, `${prefix}${entry.name}/`);
       } else if (entry.isFile() && entry.name.endsWith(".gd")) {
-        const found = /^class_name\s+([A-Za-z_][A-Za-z0-9_]*)/m.exec(readFileSync3(path, "utf8"));
+        const found = /^class_name\s+([A-Za-z_][A-Za-z0-9_]*)/m.exec(readFileSync4(path, "utf8"));
         if (found?.[1]) {
           declared.set(found[1], `res://${prefix}${entry.name}`);
         }
@@ -24764,7 +24782,7 @@ function cachedClasses(projectPath) {
     return null;
   }
   const listed = new Map;
-  const text = readFileSync3(cache, "utf8");
+  const text = readFileSync4(cache, "utf8");
   for (const entry of text.matchAll(/"class":\s*&"([^"]+)"[\s\S]*?"path":\s*"([^"]+)"/g)) {
     listed.set(entry[1] ?? "", entry[2] ?? "");
   }
@@ -25494,12 +25512,64 @@ var import_subprotocol = __toESM(require_subprotocol(), 1);
 var import_websocket = __toESM(require_websocket(), 1);
 var import_websocket_server = __toESM(require_websocket_server(), 1);
 
+// src/paths.ts
+import { isAbsolute, relative, resolve, sep } from "node:path";
+var RESOURCE_SCHEME = "res://";
+var OTHER_SCHEME = /^[a-zA-Z][a-zA-Z\d+.-]+:\/\//;
+function isSameDirectory(onePath, otherPath) {
+  return relative(resolve(onePath), resolve(otherPath)) === "";
+}
+function isWithinRoot(rootPath, candidatePath) {
+  const step = relative(resolve(rootPath), resolve(candidatePath));
+  return step !== ".." && !step.startsWith(`..${sep}`) && !isAbsolute(step);
+}
+function resolveWithinProject(projectPath, candidatePath) {
+  const trimmed = candidatePath.trim();
+  if (trimmed === "") {
+    return { ok: false, reason: "Path is empty." };
+  }
+  if (trimmed.includes("\x00")) {
+    return { ok: false, reason: "Path contains a null byte." };
+  }
+  const withoutScheme = trimmed.startsWith(RESOURCE_SCHEME) ? trimmed.slice(RESOURCE_SCHEME.length) : trimmed;
+  const scheme = OTHER_SCHEME.exec(withoutScheme);
+  if (scheme) {
+    return {
+      ok: false,
+      reason: `Path '${trimmed}' uses the '${scheme[0]}' scheme, which names somewhere other than this project.`
+    };
+  }
+  if (withoutScheme.startsWith("/") || withoutScheme.startsWith("\\") || isAbsolute(withoutScheme)) {
+    return {
+      ok: false,
+      reason: `Path '${trimmed}' is absolute; give a path inside the project, such as 'scenes/main.tscn'.`
+    };
+  }
+  if (withoutScheme.includes(":")) {
+    return {
+      ok: false,
+      reason: `Path '${trimmed}' contains ':', which no file inside a project is named with.`
+    };
+  }
+  const root = resolve(projectPath);
+  const absolutePath = resolve(root, withoutScheme);
+  if (!isWithinRoot(root, absolutePath)) {
+    return { ok: false, reason: `Path '${trimmed}' resolves outside the project directory.` };
+  }
+  const relativePath = relative(root, absolutePath).split(sep).join("/");
+  if (relativePath === "") {
+    return { ok: false, reason: `Path '${trimmed}' is the project directory itself, not a file in it.` };
+  }
+  return { ok: true, absolutePath, relativePath };
+}
+
 // src/godot-bridge.ts
 var DEFAULT_PORT = 6505;
 var DEFAULT_HOST = "127.0.0.1";
 var DEFAULT_TIMEOUT_MS = 30000;
 var KEEPALIVE_INTERVAL_MS = 1e4;
 var SECOND_CONNECTION_CLOSE_CODE = 4000;
+var OTHER_PROJECT_CLOSE_CODE = 4001;
 function resolveDefaultBridgePort() {
   return portFromEnv("GDHARNESS_BRIDGE_PORT", DEFAULT_PORT);
 }
@@ -25523,13 +25593,16 @@ class GodotBridge extends EventEmitter {
   boundPort = null;
   host;
   timeoutMs;
-  mayMove;
-  constructor(port = DEFAULT_PORT, host = DEFAULT_HOST, timeoutMs = DEFAULT_TIMEOUT_MS, mayMove = false) {
+  ownProject;
+  constructor(port = DEFAULT_PORT, host = DEFAULT_HOST, timeoutMs = DEFAULT_TIMEOUT_MS, ownProject = null) {
     super();
     this.wantedPort = port;
     this.host = host;
     this.timeoutMs = timeoutMs;
-    this.mayMove = mayMove;
+    this.ownProject = ownProject;
+  }
+  get mayMove() {
+    return this.ownProject !== null;
   }
   get port() {
     return this.boundPort ?? this.wantedPort;
@@ -25645,6 +25718,7 @@ class GodotBridge extends EventEmitter {
       lspPort: this.connectionInfo?.lspPort,
       dapPort: this.connectionInfo?.dapPort,
       debugPort: this.connectionInfo?.debugPort,
+      openedByAServer: this.connectionInfo?.openedByAServer,
       pendingRequests: this.pendingRequests.size,
       queuedResources: this.resourceQueues.size
     };
@@ -25775,12 +25849,17 @@ class GodotBridge extends EventEmitter {
       }
       case "godot_ready":
         if (this.connectionInfo) {
+          if (this.belongsElsewhere(message.project_path)) {
+            this.sendElsewhere(message.project_path);
+            return;
+          }
           this.connectionInfo.projectPath = message.project_path;
           this.connectionInfo.addonVersion = message.addon_version ?? "";
           this.connectionInfo.editorPid = message.editor_pid;
           this.connectionInfo.lspPort = servedPort(message.lsp_port);
           this.connectionInfo.dapPort = servedPort(message.dap_port);
           this.connectionInfo.debugPort = servedPort(message.debug_port);
+          this.connectionInfo.openedByAServer = message.opened_by_a_server === true;
           this.log("info", `Godot ready: ${message.project_path}`);
           this.emitBridgeEvent("godot_connected", { projectPath: message.project_path });
         }
@@ -25857,6 +25936,21 @@ class GodotBridge extends EventEmitter {
     clearInterval(this.pingInterval);
     this.pingInterval = null;
   }
+  belongsElsewhere(theirProject) {
+    if (this.ownProject === null || theirProject.trim() === "") {
+      return false;
+    }
+    return !isSameDirectory(this.ownProject, theirProject);
+  }
+  sendElsewhere(theirProject) {
+    const said = `this server serves ${this.ownProject ?? ""}, and that editor has ${theirProject} open`;
+    this.log("warn", `Turning away an editor from another project: ${said}`);
+    const stranger = this.socket;
+    this.socket = null;
+    this.connectionInfo = null;
+    this.stopKeepalive();
+    stranger?.close(OTHER_PROJECT_CLOSE_CODE, said);
+  }
   handleDisconnect(disconnectedSocket, reason) {
     if (disconnectedSocket && this.socket && disconnectedSocket !== this.socket) {
       this.log("debug", "Ignoring stale Godot socket disconnect event");
@@ -25933,8 +26027,8 @@ class GodotBridge extends EventEmitter {
   }
 }
 var defaultBridge = null;
-function getDefaultBridge(mayMove = false) {
-  defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost(), DEFAULT_TIMEOUT_MS, mayMove);
+function getDefaultBridge(ownProject = null) {
+  defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost(), DEFAULT_TIMEOUT_MS, ownProject);
   return defaultBridge;
 }
 
@@ -26056,6 +26150,7 @@ function runArguments(options) {
 function editorArguments(projectPath, ports) {
   return ["-e", "--path", projectPath, "--lsp-port", String(ports.lsp), "--dap-port", String(ports.dap)];
 }
+var OPENED_BY_A_SERVER = "GDHARNESS_OPENED_BY_A_SERVER";
 function userDataIn(home, variables = process.env) {
   const moved = ["APPDATA", "XDG_DATA_HOME"];
   const carried = {};
@@ -26495,56 +26590,6 @@ import { readFile, realpath } from "node:fs/promises";
 import { createConnection as createConnection2 } from "node:net";
 import { dirname as dirname2, resolve as resolve2 } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-
-// src/paths.ts
-import { isAbsolute, relative, resolve, sep } from "node:path";
-var RESOURCE_SCHEME = "res://";
-var OTHER_SCHEME = /^[a-zA-Z][a-zA-Z\d+.-]+:\/\//;
-function isWithinRoot(rootPath, candidatePath) {
-  const step = relative(resolve(rootPath), resolve(candidatePath));
-  return step !== ".." && !step.startsWith(`..${sep}`) && !isAbsolute(step);
-}
-function resolveWithinProject(projectPath, candidatePath) {
-  const trimmed = candidatePath.trim();
-  if (trimmed === "") {
-    return { ok: false, reason: "Path is empty." };
-  }
-  if (trimmed.includes("\x00")) {
-    return { ok: false, reason: "Path contains a null byte." };
-  }
-  const withoutScheme = trimmed.startsWith(RESOURCE_SCHEME) ? trimmed.slice(RESOURCE_SCHEME.length) : trimmed;
-  const scheme = OTHER_SCHEME.exec(withoutScheme);
-  if (scheme) {
-    return {
-      ok: false,
-      reason: `Path '${trimmed}' uses the '${scheme[0]}' scheme, which names somewhere other than this project.`
-    };
-  }
-  if (withoutScheme.startsWith("/") || withoutScheme.startsWith("\\") || isAbsolute(withoutScheme)) {
-    return {
-      ok: false,
-      reason: `Path '${trimmed}' is absolute; give a path inside the project, such as 'scenes/main.tscn'.`
-    };
-  }
-  if (withoutScheme.includes(":")) {
-    return {
-      ok: false,
-      reason: `Path '${trimmed}' contains ':', which no file inside a project is named with.`
-    };
-  }
-  const root = resolve(projectPath);
-  const absolutePath = resolve(root, withoutScheme);
-  if (!isWithinRoot(root, absolutePath)) {
-    return { ok: false, reason: `Path '${trimmed}' resolves outside the project directory.` };
-  }
-  const relativePath = relative(root, absolutePath).split(sep).join("/");
-  if (relativePath === "") {
-    return { ok: false, reason: `Path '${trimmed}' is the project directory itself, not a file in it.` };
-  }
-  return { ok: true, absolutePath, relativePath };
-}
-
-// src/lsp_client.ts
 var DEFAULT_LSP_PORT = 6005;
 var DIAGNOSTICS_TIMEOUT_MS = 5000;
 function diagnosticsKey(uri) {
@@ -27038,7 +27083,7 @@ async function handleLSPTool(client, toolName, args) {
 }
 
 // src/project-scan.ts
-import { readdirSync as readdirSync3, readFileSync as readFileSync4 } from "node:fs";
+import { readdirSync as readdirSync3, readFileSync as readFileSync5 } from "node:fs";
 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"]);
@@ -27103,7 +27148,7 @@ function searchProject(projectPath, options) {
       }
       result.summary.files_searched += 1;
       const matches = [];
-      for (const [index, line] of readFileSync4(entryPath, "utf8").split(`
+      for (const [index, line] of readFileSync5(entryPath, "utf8").split(`
 `).entries()) {
         if (full()) {
           break;
@@ -27126,7 +27171,7 @@ function searchProject(projectPath, options) {
 }
 
 // src/resources.ts
-import { readFileSync as readFileSync5 } from "node:fs";
+import { readFileSync as readFileSync6 } from "node:fs";
 import { extname, resolve as resolve3 } from "node:path";
 var STATIC_RESOURCES = [
   {
@@ -27297,7 +27342,7 @@ function readResourceText(uri, getProjectPath) {
   const parsedUri = parseGodotUri(uri);
   if (parsedUri.kind === "project-info") {
     const projectFilePath = resolveProjectFile(projectPath, "project.godot");
-    const rawProject = readFileSync5(projectFilePath, "utf-8");
+    const rawProject = readFileSync6(projectFilePath, "utf-8");
     const parsedProject = parseProjectGodot(rawProject);
     return {
       mimeType: "application/json",
@@ -27306,7 +27351,7 @@ function readResourceText(uri, getProjectPath) {
   }
   const filePath = resolveProjectFile(projectPath, parsedUri.resourcePath);
   ensureAllowedExtension(parsedUri.kind, filePath);
-  const text = readFileSync5(filePath, "utf-8");
+  const text = readFileSync6(filePath, "utf-8");
   return {
     mimeType: parsedUri.kind === "script" ? "text/x-gdscript" : "text/plain",
     text
@@ -27343,7 +27388,7 @@ function setupResourceHandlers(mcp, getProjectPath) {
 }
 
 // src/runtime-client.ts
-import { existsSync as existsSync5, readdirSync as readdirSync4, readFileSync as readFileSync6, unlinkSync } from "node:fs";
+import { existsSync as existsSync5, readdirSync as readdirSync4, readFileSync as readFileSync7, unlinkSync } from "node:fs";
 import { createConnection as createConnection3 } from "node:net";
 import { tmpdir as tmpdir3 } from "node:os";
 import { join as join7, resolve as resolve4 } from "node:path";
@@ -27429,7 +27474,7 @@ function processAlive(pid) {
 function parseAnnouncement(file, pid) {
   let fields;
   try {
-    fields = asParams(JSON.parse(readFileSync6(file, "utf8")));
+    fields = asParams(JSON.parse(readFileSync7(file, "utf8")));
   } catch {
     return { kind: "rubbish" };
   }
@@ -27619,7 +27664,7 @@ function runtimeRequest(endpoint, command, params, timeoutMs) {
 }
 
 // src/setup.ts
-import { cpSync, existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync7, rmSync as rmSync3, writeFileSync as writeFileSync4 } from "node:fs";
+import { cpSync, existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync8, rmSync as rmSync3, writeFileSync as writeFileSync4 } from "node:fs";
 import { dirname as dirname3, join as join8 } from "node:path";
 var ADDONS = ["gdharness_editor", "gdharness_runtime", "auto_reload"];
 var VERSION_MARKER = ".gdharness-version";
@@ -27628,7 +27673,7 @@ function installedAddonVersion(projectPath) {
   if (!existsSync6(marker)) {
     return null;
   }
-  const said = readFileSync7(marker, "utf8").trim();
+  const said = readFileSync8(marker, "utf8").trim();
   return said === "" ? null : said;
 }
 
@@ -28398,7 +28443,11 @@ var TOOL_SPECS = [
         blank: true,
         description: `set: the value, fitted to the property's type. "" writes an empty string.`
       },
-      method: { type: "string", ops: ["call"] },
+      method: {
+        type: "string",
+        ops: ["call"],
+        description: 'call: which one to call. Colons call through the objects a node holds, "_game:run:advance", the same way a property is written through them.'
+      },
       args: {
         type: "array",
         ops: ["call"],
@@ -28411,7 +28460,10 @@ var TOOL_SPECS = [
         summary: "set a property, on a node or on an object it holds",
         requires: ["property", "value"]
       },
-      call: { summary: "call a method and return its result", requires: ["method"] }
+      call: {
+        summary: "call a method, on a node or on an object it holds, and return its result",
+        requires: ["method"]
+      }
     }
   },
   {
@@ -28668,6 +28720,17 @@ var SLOWEST_FRAME_RATE = 20;
 function patienceForFrames(frames, atLeast) {
   return Math.max(atLeast, frames / SLOWEST_FRAME_RATE * 1000 + atLeast);
 }
+function alive(pid) {
+  if (pid === undefined) {
+    return false;
+  }
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function isOfType(value, kind) {
   switch (kind) {
     case "string":
@@ -28714,6 +28777,7 @@ function wrongTypes(spec, args) {
   return complaints;
 }
 var BRIDGE_RETRY_MS = 2000;
+var SUCCESSOR_CHECK_MS = 1e4;
 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"
@@ -28801,11 +28865,11 @@ function aboveTheRunner(entry) {
   };
 }
 function hasMainScene(projectFile) {
-  const scene = parseProjectGodot(readFileSync8(projectFile, "utf8"))["application"]?.["run/main_scene"];
+  const scene = parseProjectGodot(readFileSync9(projectFile, "utf8"))["application"]?.["run/main_scene"];
   return typeof scene === "string" && scene !== "";
 }
 function editorPlaysHeadless(projectFile) {
-  const runArgs = parseProjectGodot(readFileSync8(projectFile, "utf8"))["editor"]?.["run/main_run_args"];
+  const runArgs = parseProjectGodot(readFileSync9(projectFile, "utf8"))["editor"]?.["run/main_run_args"];
   return typeof runArgs === "string" && /(?:^|\s)--headless(?:\s|$)/.test(runArgs);
 }
 function camelCased(params) {
@@ -28833,13 +28897,14 @@ class GodotServer {
   dapClient = null;
   bridgeStartupError = null;
   bridgeRetry = null;
+  successorWatch = null;
   lastProjectPath = null;
   shutdownInitiated = false;
   ownProject;
   announcedAt = null;
   constructor() {
     this.ownProject = envValue("GDHARNESS_PROJECT") ?? null;
-    this.godotBridge = getDefaultBridge(this.ownProject !== null);
+    this.godotBridge = getDefaultBridge(this.ownProject);
     this.mcp = new McpServer({ name: "gdharness", version: SERVER_VERSION }, { capabilities: { tools: {}, resources: {} } });
     this.setupToolHandlers();
     setupResourceHandlers(this.mcp, () => this.lastProjectPath);
@@ -28932,6 +28997,7 @@ class GodotServer {
       port: status.port,
       version: SERVER_VERSION
     });
+    this.watchForASuccessor();
   }
   stopTryingTheBridge() {
     if (this.bridgeRetry !== null) {
@@ -28939,9 +29005,41 @@ class GodotServer {
       this.bridgeRetry = null;
     }
   }
+  watchForASuccessor() {
+    if (this.ownProject === null || this.successorWatch !== null) {
+      return;
+    }
+    const watch = setInterval(() => {
+      const successor = this.supersededBy();
+      if (successor === null) {
+        return;
+      }
+      console.error(`[SERVER] pid ${successor} now serves ${this.ownProject}; this server is finished and is stopping.`);
+      this.handleShutdown(`superseded by ${successor}`, 0);
+    }, SUCCESSOR_CHECK_MS);
+    watch.unref();
+    this.successorWatch = watch;
+  }
+  supersededBy() {
+    if (this.ownProject === null) {
+      return null;
+    }
+    const announced = readAnnouncement(announcementPath(this.ownProject));
+    if (announced === null || announced.pid === process.pid) {
+      return null;
+    }
+    return alive(announced.pid) ? announced.pid : null;
+  }
+  stopWatchingForASuccessor() {
+    if (this.successorWatch !== null) {
+      clearInterval(this.successorWatch);
+      this.successorWatch = null;
+    }
+  }
   async cleanup() {
     this.logDebug("Cleaning up resources");
     this.stopTryingTheBridge();
+    this.stopWatchingForASuccessor();
     withdrawBridge(this.announcedAt);
     this.announcedAt = null;
     if (this.activeProcess) {
@@ -29523,7 +29621,7 @@ class GodotServer {
     if (!engine.ok) {
       return engine.response;
     }
-    const application = parseProjectGodot(readFileSync8(project.value.file, "utf8"))["application"] ?? {};
+    const application = parseProjectGodot(readFileSync9(project.value.file, "utf8"))["application"] ?? {};
     const name = application["config/name"];
     const mainScene = application["run/main_scene"];
     const info = {
@@ -29698,7 +29796,7 @@ class GodotServer {
       const written = existsSync7(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(readFileSync8(join9(reportsDir, newest, "results.xml"), "utf8"));
+        report = parseJUnit(readFileSync9(join9(reportsDir, newest, "results.xml"), "utf8"));
       }
     } catch (error) {
       reportProblem = errorMessage(error);
@@ -29897,7 +29995,8 @@ class GodotServer {
         "editor_status says whether the bridge is up and what has reached it"
       ]);
     }
-    const asked = await this.handleViaBridge("restart_editor", {});
+    const mine = before.openedByAServer === true && before.projectPath !== undefined;
+    const asked = mine ? await this.startItAgain(before.projectPath ?? "", before.editorPid) : await this.handleViaBridge("restart_editor", {});
     if (asked.isError === true) {
       return asked;
     }
@@ -29925,6 +30024,26 @@ class GodotServer {
       tookMs: Date.now() - began
     });
   }
+  async startItAgain(projectPath, editorPid) {
+    const engine = await this.engine();
+    if (!engine.ok) {
+      return engine.response;
+    }
+    const ports = {
+      lsp: this.editorServes("lspPort", "GDHARNESS_LSP_PORT", DEFAULT_LSP_PORT),
+      dap: this.editorServes("dapPort", "GDHARNESS_DAP_PORT", DEFAULT_DAP_PORT)
+    };
+    const asked = await this.handleViaBridge("quit_editor", {});
+    if (asked.isError === true) {
+      return asked;
+    }
+    await this.waitForBridge(() => !alive(editorPid), Date.now() + EDITOR_RESTART_TIMEOUT_MS);
+    const opened = await this.openAnEditor(engine.value, projectPath, ports);
+    if (opened.error !== null) {
+      return this.createErrorResponse(`The editor was asked to go and could not be started again: ${opened.error}`, [`editor_launch opens one on ${projectPath}`]);
+    }
+    return this.jsonTextResponse({ restarting: true, pid: opened.pid });
+  }
   async waitForBridge(reached, deadline) {
     for (;; ) {
       if (reached()) {
@@ -29954,14 +30073,28 @@ class GodotServer {
     }
     this.logDebug(`Launching Godot editor for project: ${project.value.path}`);
     const ports = await this.portsForAnEditor();
-    const editor = spawn(engine.value, editorArguments(project.value.path, ports), {
+    const opened = await this.openAnEditor(engine.value, project.value.path, ports);
+    if (opened.error !== null) {
+      return this.createErrorResponse(`Could not start the editor: ${opened.error}`);
+    }
+    return this.jsonTextResponse({
+      launched: true,
+      pid: opened.pid,
+      projectPath: project.value.path,
+      lspPort: ports.lsp,
+      dapPort: ports.dap
+    });
+  }
+  async openAnEditor(engine, projectPath, ports) {
+    const editor = spawn(engine, editorArguments(projectPath, ports), {
       stdio: "ignore",
       detached: true,
       env: {
         ...process.env,
         GDHARNESS_RUNTIME_DIR: runtimeDirectory(),
         GDHARNESS_LSP_PORT: String(ports.lsp),
-        GDHARNESS_DAP_PORT: String(ports.dap)
+        GDHARNESS_DAP_PORT: String(ports.dap),
+        [OPENED_BY_A_SERVER]: "1"
       }
     });
     const started = await new Promise((resolve) => {
@@ -29973,16 +30106,10 @@ class GodotServer {
       });
     });
     if (started !== null) {
-      return this.createErrorResponse(`Could not start the editor: ${started}`);
+      return { pid: null, error: started };
     }
     editor.unref();
-    return this.jsonTextResponse({
-      launched: true,
-      pid: editor.pid ?? null,
-      projectPath: project.value.path,
-      lspPort: ports.lsp,
-      dapPort: ports.dap
-    });
+    return { pid: editor.pid ?? null, error: null };
   }
   async portsForAnEditor() {
     const lsp = portFromEnvOrNull("GDHARNESS_LSP_PORT") ?? await freePort(DEFAULT_LSP_PORT);
@@ -30288,7 +30415,7 @@ class GodotServer {
       return {
         content: [
           { type: "text", text: `Screenshot captured: ${dimensions}` },
-          { type: "image", data: readFileSync8(screenshotPath).toString("base64"), mimeType: "image/png" }
+          { type: "image", data: readFileSync9(screenshotPath).toString("base64"), mimeType: "image/png" }
         ]
       };
     } finally {

package/package.json

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