gdharness 1.1.30 → 1.1.31

package/build/cli.js

@@ -384,9 +384,18 @@ function readCommandLine(command) {
   return {
     executable,
     projectPath,
-    editor: words.some((word) => word === "-e" || word === "--editor")
+    editor: words.some((word) => word === "-e" || word === "--editor"),
+    oneShot: words.find((word) => ONE_SHOT_OPTIONS.includes(word)) ?? null
   };
 }
+async function oneShotOptionOf(pid) {
+  const tree = await processTree();
+  const listed = tree?.get(pid);
+  if (listed === undefined || listed.command === "") {
+    return;
+  }
+  return readCommandLine(listed.command).oneShot;
+}
 function commandWords(command) {
   const words = [];
   let word = "";
@@ -422,10 +431,31 @@ async function askPosix() {
   });
   return stdout;
 }
-var run, ASK_TIMEOUT_MS = 15000, lastListingFailure;
+var run, ASK_TIMEOUT_MS = 15000, lastListingFailure, ONE_SHOT_OPTIONS;
 var init_process_children = __esm(() => {
   init_windows_ask();
   run = promisify(execFile);
+  ONE_SHOT_OPTIONS = [
+    "--import",
+    "--quit",
+    "--quit-after",
+    "--export-release",
+    "--export-debug",
+    "--export-pack",
+    "--export-patch",
+    "--doctool",
+    "--gdscript-docs",
+    "--script",
+    "-s",
+    "--check-only",
+    "--build-solutions",
+    "--dump-gdextension-interface",
+    "--dump-extension-api",
+    "--dump-extension-api-with-docs",
+    "--validate-extension-api",
+    "--convert-3to4",
+    "--validate-conversion-3to4"
+  ];
 });
 
 // src/bridge-announce.ts
@@ -17617,7 +17647,7 @@ var init_tool_definitions = __esm(() => {
     },
     {
       name: "editor_status",
-      description: "Whether the editor addon is connected, which Godot answers, whether the editor is playing something, and whether a game with the runtime addon is reachable: runtimeConnected counts the games of the project this server serves, and runtimes lists every game on the machine with ofThisProject saying which is which, since a game of another project is reached only by naming its projectPath. playingInEditor is null when the editor was not asked or did not answer, which is not the same as a no: with no editor connected there is nobody to ask, and an editor that does not serve the question is given a moment and then left. A game can be playing while this is null, so read it as unanswered rather than as nothing playing, and use processActive and runtimes, which come from elsewhere and do not depend on the editor answering. game.run names the run processActive is about, the one editor_output and editor_run stop answer for: its pid, its project, and adopted true when this server read it back from another server rather than starting it; null when there is none. editor.scan says whether the editor is scanning or importing and how many milliseconds ago its last scan finished (finishedMsAgo), or is null when it did not answer: the editor rewrites the class cache just after a scan, and editor_run waits that out before starting a game, saying so under waitedForEditorScanMs. Each game under runtimes is pinged with a short wait, so one held at a breakpoint is listed as unreachable rather than making this call wait out the runtime timeout; for the run this server is reporting on, heldAt says whether that is what it is, with the same three answers editor_output gives. A game the editor played announces the editor under editorPid, and so does whatever that game started for itself; a game some other server started announces none, which is how the two are told apart when both are running from one project. Each game also says which runtime addon it loaded, under addonVersion (null when it cannot say); addonIsStale is true when that code is not what this server ships, and staleNote says whether the project needs gdharness upgrade, the game a restart, or this server a reconnect. A second checkout of a project, such as a git worktree, carries addons of its own and is where this shows. Every runtime_* answer from such a game carries addonIsStale and staleNote too. When connected is false, mayYetConnect says whether that is final: the editor dials this server rather than the other way round and backs off between tries, so for the first half-minute after a server starts, false means \"not reached yet\" as often as it means \"no editor\". True is worth waiting out; false is an editor that is not there. False beside restartInterrupted is one that an editor_launch restart on a previous server asked to quit, where the launch half never ran because that server was ended in between, usually by the reconnect the restart was taken for; editor_launch open finishes it. True beside restartUnderway is a restart still in progress, its server alive and within the wait for the old editor to go: the editor is coming, and opening another would put two on one project. listeningSince is when this server took the bridge port, which is what that window is measured from and what a caller wanting its own window should read. An editor this server opened counts for as long as its process lives, however far past that window the import runs, and awaitingLaunchedEditor names its pid so the two reasons for true are told apart. settingsDropped appears here once when the editor this server opened saved project.godot on its way in, which is the same reading editor_launch restart makes in its own answer. A game that has announced itself in a protocol this server does not speak is listed under unreadable rather than left out, with the protocol it speaks and whether the server or the addon is the older half. This happens during an upgrade that moves the runtime protocol, which most do not: installing replaces the addon on disk as soon as the pin moves, while a server that is already running stays on the version it started with, so the two speak different protocols until the server is reconnected. Those games are real and running, but no tool here can reach them until the halves match, so runtimes stays empty and runtimeConnected stays false. An upgrade that leaves the protocol alone opens no such window and this list stays empty through it. addonIsStale is decided by the code of the editor addons rather than their version, so an editor started before an upgrade that left that code alone reports the older addonVersion, is not stale, and addonNote says so: it needs no restart. port is the one the editor bridge is on; when that is not the one this server was configured with, portWanted names the configured one and portNote says why it moved and, when it was the server this one replaced, which pid kept it. A server replacing another of its project that holds the configured port waits for it to stand down and takes the port over, which takes a few seconds; bridgeHandover says so while it waits, and it moves only if that server has not let go within the wait. An editor that has connected and not yet greeted, which lasts a frame and longer while it imports, reports nothing about itself: greeting says so, addonIsStale is absent rather than guessed, and a restart asked then waits for the greeting to learn who opened it. startedByAnEditor is an editor another editor started, by Godot's own restart or the project manager, which has none of the arguments a server gave the one before it; startedByAnEditorNote says what that costs.",
+      description: "Whether the editor addon is connected, which Godot answers, whether the editor is playing something, and whether a game with the runtime addon is reachable: runtimeConnected counts the games of the project this server serves, and runtimes lists every game on the machine with ofThisProject saying which is which, since a game of another project is reached only by naming its projectPath. playingInEditor is null when the editor was not asked or did not answer, which is not the same as a no: with no editor connected there is nobody to ask, and an editor that does not serve the question is given a moment and then left. A game can be playing while this is null, so read it as unanswered rather than as nothing playing, and use processActive and runtimes, which come from elsewhere and do not depend on the editor answering. game.run names the run processActive is about, the one editor_output and editor_run stop answer for: its pid, its project, and adopted true when this server read it back from another server rather than starting it; null when there is none. editor.scan says whether the editor is scanning or importing and how many milliseconds ago its last scan finished (finishedMsAgo), or is null when it did not answer: the editor rewrites the class cache just after a scan, and editor_run waits that out before starting a game, saying so under waitedForEditorScanMs. Each game under runtimes is pinged with a short wait, so one held at a breakpoint is listed as unreachable rather than making this call wait out the runtime timeout; for the run this server is reporting on, heldAt says whether that is what it is, with the same three answers editor_output gives. A game the editor played announces the editor under editorPid, and so does whatever that game started for itself; a game some other server started announces none, which is how the two are told apart when both are running from one project. Each game also says which runtime addon it loaded, under addonVersion (null when it cannot say); addonIsStale is true when that code is not what this server ships, and staleNote says whether the project needs gdharness upgrade, the game a restart, or this server a reconnect. A second checkout of a project, such as a git worktree, carries addons of its own and is where this shows. Every runtime_* answer from such a game carries addonIsStale and staleNote too. When connected is false, mayYetConnect says whether that is final: the editor dials this server rather than the other way round and backs off between tries, so for the first half-minute after a server starts, false means \"not reached yet\" as often as it means \"no editor\". True is worth waiting out; false is an editor that is not there. False beside restartInterrupted is one that an editor_launch restart on a previous server asked to quit, where the launch half never ran because that server was ended in between, usually by the reconnect the restart was taken for; editor_launch open finishes it. True beside restartUnderway is a restart still in progress, its server alive and within the wait for the old editor to go: the editor is coming, and opening another would put two on one project. listeningSince is when this server took the bridge port, which is what that window is measured from and what a caller wanting its own window should read. An editor this server opened counts for as long as its process lives, however far past that window the import runs, and awaitingLaunchedEditor names its pid so the two reasons for true are told apart. settingsDropped appears here once when the editor this server opened saved project.godot on its way in, which is the same reading editor_launch restart makes in its own answer. A game that has announced itself in a protocol this server does not speak is listed under unreadable rather than left out, with the protocol it speaks and whether the server or the addon is the older half. This happens during an upgrade that moves the runtime protocol, which most do not: installing replaces the addon on disk as soon as the pin moves, while a server that is already running stays on the version it started with, so the two speak different protocols until the server is reconnected. Those games are real and running, but no tool here can reach them until the halves match, so runtimes stays empty and runtimeConnected stays false. An upgrade that leaves the protocol alone opens no such window and this list stays empty through it. addonIsStale is decided by the code of the editor addons rather than their version, so an editor started before an upgrade that left that code alone reports the older addonVersion, is not stale, and addonNote says so: it needs no restart. port is the one the editor bridge is on; when that is not the one this server was configured with, portWanted names the configured one and portNote says why it moved and, when it was the server this one replaced, which pid kept it. A server replacing another of its project that holds the configured port waits for it to stand down and takes the port over, which takes a few seconds; bridgeHandover says so while it waits, and it moves only if that server has not let go within the wait. An editor that has connected and not yet greeted, which lasts a frame and longer while it imports, reports nothing about itself: greeting says so, addonIsStale is absent rather than guessed, and a restart asked then waits for the greeting to learn who opened it. startedByAnEditor is an editor another editor started, by Godot's own restart or the project manager, which has none of the arguments a server gave the one before it; startedByAnEditorNote says what that costs. An engine run that loads the editor addon to do one job and quit, such as a gate's godot --headless --import, an export or a script, is not taken as the editor: a process that greets without a server's mark has its command line read first, and while that is read identifying is true and connected false; one started with such an option is turned away, and turnedAway names the last one, its pid and the option.",
       parameters: {},
       requires: []
     },
@@ -37477,7 +37507,7 @@ function getDefaultBridge(ownProject = null) {
   defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost(), DEFAULT_TIMEOUT_MS, ownProject);
   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, OTHER_PROJECT_CLOSE_CODE = 4001, CONNECT_WINDOW_MS = 35000, GodotBridge, defaultBridge = null;
+var DEFAULT_PORT = 6505, DEFAULT_HOST = "127.0.0.1", DEFAULT_TIMEOUT_MS = 30000, KEEPALIVE_INTERVAL_MS = 1e4, SECOND_CONNECTION_CLOSE_CODE = 4000, OTHER_PROJECT_CLOSE_CODE = 4001, ONE_SHOT_CLOSE_CODE = 4002, CONNECT_WINDOW_MS = 35000, GodotBridge, defaultBridge = null;
 var init_godot_bridge = __esm(() => {
   init_wrapper();
   init_errors();
@@ -37490,6 +37520,9 @@ var init_godot_bridge = __esm(() => {
     socket = null;
     pingInterval = null;
     connectionInfo = null;
+    oneShotReader = null;
+    oneShots = new Map;
+    turnedAway = null;
     pendingRequests = new Map;
     resourceQueues = new Map;
     wantedPort;
@@ -37504,6 +37537,9 @@ var init_godot_bridge = __esm(() => {
       this.timeoutMs = timeoutMs;
       this.ownProject = ownProject;
     }
+    identifyEditorsWith(reader) {
+      this.oneShotReader = reader;
+    }
     get mayMove() {
       return this.ownProject !== null;
     }
@@ -37610,25 +37646,29 @@ var init_godot_bridge = __esm(() => {
       this.log("info", "WebSocket bridge stopped");
     }
     isConnected() {
-      return this.socket?.readyState === import_websocket.default.OPEN;
+      return this.socket?.readyState === import_websocket.default.OPEN && this.connectionInfo?.identifying !== true;
     }
     getStatus() {
+      const identifying = this.connectionInfo?.identifying === true;
+      const editor = identifying ? null : this.connectionInfo;
       return {
         host: this.host,
         port: this.port,
         connected: this.isConnected(),
-        projectPath: this.connectionInfo?.projectPath,
-        connectedAt: this.connectionInfo?.connectedAt,
-        lastPongAt: this.connectionInfo?.lastPongAt,
-        addonVersion: this.connectionInfo?.addonVersion,
-        addonDigest: this.connectionInfo?.addonDigest,
-        editorPid: this.connectionInfo?.editorPid,
-        lspPort: this.connectionInfo?.lspPort,
-        dapPort: this.connectionInfo?.dapPort,
-        debugPort: this.connectionInfo?.debugPort,
-        openedByAServer: this.connectionInfo?.openedByAServer,
-        startedByAnEditor: this.connectionInfo?.startedByAnEditor,
-        syncsBreakpoints: this.connectionInfo?.syncsBreakpoints,
+        projectPath: editor?.projectPath,
+        connectedAt: editor?.connectedAt,
+        lastPongAt: editor?.lastPongAt,
+        addonVersion: editor?.addonVersion,
+        addonDigest: editor?.addonDigest,
+        editorPid: editor?.editorPid,
+        lspPort: editor?.lspPort,
+        dapPort: editor?.dapPort,
+        debugPort: editor?.debugPort,
+        openedByAServer: editor?.openedByAServer,
+        startedByAnEditor: editor?.startedByAnEditor,
+        syncsBreakpoints: editor?.syncsBreakpoints,
+        turnedAway: this.turnedAway ?? undefined,
+        identifying: identifying ? true : undefined,
         pendingRequests: this.pendingRequests.size,
         queuedResources: this.resourceQueues.size,
         listeningSince: this.listeningSince ?? undefined,
@@ -37776,6 +37816,11 @@ var init_godot_bridge = __esm(() => {
             this.connectionInfo.startedByAnEditor = typeof message.started_by_an_editor === "boolean" ? message.started_by_an_editor : undefined;
             this.connectionInfo.syncsBreakpoints = typeof message.syncs_breakpoints === "boolean" ? message.syncs_breakpoints : undefined;
             this.log("info", `Godot ready: ${message.project_path}`);
+            const pid = this.connectionInfo.editorPid;
+            if (!this.connectionInfo.openedByAServer && pid !== undefined && this.oneShotReader !== null) {
+              this.identify(pid);
+              return;
+            }
             this.emitBridgeEvent("godot_connected", { projectPath: message.project_path });
           }
           return;
@@ -37866,6 +37911,45 @@ var init_godot_bridge = __esm(() => {
       this.stopKeepalive();
       stranger?.close(OTHER_PROJECT_CLOSE_CODE, said);
     }
+    identify(pid) {
+      const known = this.oneShots.get(pid);
+      if (known !== undefined) {
+        this.turnAway(pid, known);
+        return;
+      }
+      const info = this.connectionInfo;
+      const socket = this.socket;
+      const reader = this.oneShotReader;
+      if (info === null || reader === null) {
+        return;
+      }
+      info.identifying = true;
+      reader(pid).catch(() => {
+        return;
+      }).then((option) => {
+        if (this.socket !== socket || this.connectionInfo !== info) {
+          return;
+        }
+        if (typeof option === "string") {
+          this.oneShots.set(pid, option);
+          this.turnAway(pid, option);
+          return;
+        }
+        info.identifying = false;
+        this.log("info", `Godot editor identified: pid ${pid}`);
+        this.emitBridgeEvent("godot_connected", { projectPath: info.projectPath });
+      });
+    }
+    turnAway(pid, option) {
+      const said = `pid ${pid} was started with ${option}, which does one job and quits, so it is not an editor`;
+      this.log("info", `Turning away an engine run: ${said}`);
+      this.turnedAway = { pid, option, at: new Date };
+      const run = this.socket;
+      this.socket = null;
+      this.connectionInfo = null;
+      this.stopKeepalive();
+      run?.close(ONE_SHOT_CLOSE_CODE, said);
+    }
     handleDisconnect(disconnectedSocket, reason) {
       if (disconnectedSocket && this.socket && disconnectedSocket !== this.socket) {
         this.log("debug", "Ignoring stale Godot socket disconnect event");
@@ -40259,6 +40343,7 @@ class GodotServer {
   constructor() {
     this.ownProject = envValue("GDHARNESS_PROJECT") ?? null;
     this.godotBridge = getDefaultBridge(this.ownProject);
+    this.godotBridge.identifyEditorsWith(oneShotOptionOf);
     this.godotBridge.on("godot_connected", () => {
       this.settleTheLaunchReading();
     });
@@ -42518,6 +42603,10 @@ class GodotServer {
     const dap = portFromEnvOrNull("GDHARNESS_DAP_PORT") ?? await freePort(DEFAULT_DAP_PORT);
     return { lsp, dap };
   }
+  editorOnTheBridge() {
+    const pid = this.godotBridge.getStatus().editorPid;
+    return pid === undefined ? "the editor on this bridge" : `the editor on this bridge (pid ${pid})`;
+  }
   async handleRunProject(args, op) {
     const project = this.project(args);
     if (!project.ok) {
@@ -42525,7 +42614,7 @@ class GodotServer {
     }
     const open = this.godotBridge.isConnected() ? this.godotBridge.getStatus().projectPath : undefined;
     if (op !== "check" && open !== undefined && open !== "" && !isSameDirectory(open, project.value.path)) {
-      return this.createErrorResponse(`This start names ${project.value.path}, and the editor on this bridge has ${open} open.`, [
+      return this.createErrorResponse(`This start names ${project.value.path}, and ${this.editorOnTheBridge()} has ${open} open.`, [
         "editor_status names the project this server's editor is showing",
         "One server serves one editor: start a second server for the other project"
       ]);
@@ -44242,7 +44331,7 @@ class GodotServer {
     const open = this.godotBridge.getStatus().projectPath;
     const meant = readNonEmptyString(args, "projectPath");
     if (open !== undefined && open !== "" && meant !== undefined && !isSameDirectory(open, meant)) {
-      return this.createErrorResponse(`This call names ${meant}, and the editor on this bridge has ${open} open.`, [
+      return this.createErrorResponse(`This call names ${meant}, and ${this.editorOnTheBridge()} has ${open} open.`, [
         "editor_status names the project this server's editor is showing",
         "One server serves one editor: start a second server for the other project"
       ]);

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

@@ -25,6 +25,10 @@ const MAX_RECONNECT_DELAY: float = 30.0
 ## What a server closes with when the editor that said hello belongs to another project. Kept in
 ## step with `OTHER_PROJECT_CLOSE_CODE` in src/godot-bridge.ts.
 const ELSEWHERE_CLOSE_CODE: int = 4001
+## What a server closes with when this process is one job that quits, such as a gate's `--import`,
+## rather than an editor: dialling in again changes nothing for the rest of the run. Kept in step
+## with `ONE_SHOT_CLOSE_CODE` in src/godot-bridge.ts.
+const ONE_SHOT_CLOSE_CODE: int = 4002
 
 ## Where Godot keeps the three ports an editor serves. None of them is per editor: the settings
 ## file is one for every editor of this engine version on the machine, so two open at once want the
@@ -447,6 +451,8 @@ func _read_marker(path: String) -> String:
 func _handle_disconnect() -> void:
 	_is_connected = false
 	_said_elsewhere()
+	if socket.get_close_code() == ONE_SHOT_CLOSE_CODE:
+		_should_reconnect = false
 	disconnected.emit()
 
 	if _should_reconnect:

package/build/index.js

@@ -25284,6 +25284,27 @@ function ancestorsIn(tree, pid, root) {
   }
   return chain;
 }
+var ONE_SHOT_OPTIONS = [
+  "--import",
+  "--quit",
+  "--quit-after",
+  "--export-release",
+  "--export-debug",
+  "--export-pack",
+  "--export-patch",
+  "--doctool",
+  "--gdscript-docs",
+  "--script",
+  "-s",
+  "--check-only",
+  "--build-solutions",
+  "--dump-gdextension-interface",
+  "--dump-extension-api",
+  "--dump-extension-api-with-docs",
+  "--validate-extension-api",
+  "--convert-3to4",
+  "--validate-conversion-3to4"
+];
 function readCommandLine(command) {
   const all = commandWords(command);
   const separator = all.findIndex((word) => word === "--" || word === "++");
@@ -25304,9 +25325,18 @@ function readCommandLine(command) {
   return {
     executable,
     projectPath,
-    editor: words.some((word) => word === "-e" || word === "--editor")
+    editor: words.some((word) => word === "-e" || word === "--editor"),
+    oneShot: words.find((word) => ONE_SHOT_OPTIONS.includes(word)) ?? null
   };
 }
+async function oneShotOptionOf(pid) {
+  const tree = await processTree();
+  const listed = tree?.get(pid);
+  if (listed === undefined || listed.command === "") {
+    return;
+  }
+  return readCommandLine(listed.command).oneShot;
+}
 function commandWords(command) {
   const words = [];
   let word = "";
@@ -27664,6 +27694,7 @@ var DEFAULT_TIMEOUT_MS = 30000;
 var KEEPALIVE_INTERVAL_MS = 1e4;
 var SECOND_CONNECTION_CLOSE_CODE = 4000;
 var OTHER_PROJECT_CLOSE_CODE = 4001;
+var ONE_SHOT_CLOSE_CODE = 4002;
 function resolveDefaultBridgePort() {
   return portFromEnv("GDHARNESS_BRIDGE_PORT", DEFAULT_PORT);
 }
@@ -27695,6 +27726,9 @@ class GodotBridge extends EventEmitter {
   socket = null;
   pingInterval = null;
   connectionInfo = null;
+  oneShotReader = null;
+  oneShots = new Map;
+  turnedAway = null;
   pendingRequests = new Map;
   resourceQueues = new Map;
   wantedPort;
@@ -27709,6 +27743,9 @@ class GodotBridge extends EventEmitter {
     this.timeoutMs = timeoutMs;
     this.ownProject = ownProject;
   }
+  identifyEditorsWith(reader) {
+    this.oneShotReader = reader;
+  }
   get mayMove() {
     return this.ownProject !== null;
   }
@@ -27815,25 +27852,29 @@ class GodotBridge extends EventEmitter {
     this.log("info", "WebSocket bridge stopped");
   }
   isConnected() {
-    return this.socket?.readyState === import_websocket.default.OPEN;
+    return this.socket?.readyState === import_websocket.default.OPEN && this.connectionInfo?.identifying !== true;
   }
   getStatus() {
+    const identifying = this.connectionInfo?.identifying === true;
+    const editor = identifying ? null : this.connectionInfo;
     return {
       host: this.host,
       port: this.port,
       connected: this.isConnected(),
-      projectPath: this.connectionInfo?.projectPath,
-      connectedAt: this.connectionInfo?.connectedAt,
-      lastPongAt: this.connectionInfo?.lastPongAt,
-      addonVersion: this.connectionInfo?.addonVersion,
-      addonDigest: this.connectionInfo?.addonDigest,
-      editorPid: this.connectionInfo?.editorPid,
-      lspPort: this.connectionInfo?.lspPort,
-      dapPort: this.connectionInfo?.dapPort,
-      debugPort: this.connectionInfo?.debugPort,
-      openedByAServer: this.connectionInfo?.openedByAServer,
-      startedByAnEditor: this.connectionInfo?.startedByAnEditor,
-      syncsBreakpoints: this.connectionInfo?.syncsBreakpoints,
+      projectPath: editor?.projectPath,
+      connectedAt: editor?.connectedAt,
+      lastPongAt: editor?.lastPongAt,
+      addonVersion: editor?.addonVersion,
+      addonDigest: editor?.addonDigest,
+      editorPid: editor?.editorPid,
+      lspPort: editor?.lspPort,
+      dapPort: editor?.dapPort,
+      debugPort: editor?.debugPort,
+      openedByAServer: editor?.openedByAServer,
+      startedByAnEditor: editor?.startedByAnEditor,
+      syncsBreakpoints: editor?.syncsBreakpoints,
+      turnedAway: this.turnedAway ?? undefined,
+      identifying: identifying ? true : undefined,
       pendingRequests: this.pendingRequests.size,
       queuedResources: this.resourceQueues.size,
       listeningSince: this.listeningSince ?? undefined,
@@ -27981,6 +28022,11 @@ class GodotBridge extends EventEmitter {
           this.connectionInfo.startedByAnEditor = typeof message.started_by_an_editor === "boolean" ? message.started_by_an_editor : undefined;
           this.connectionInfo.syncsBreakpoints = typeof message.syncs_breakpoints === "boolean" ? message.syncs_breakpoints : undefined;
           this.log("info", `Godot ready: ${message.project_path}`);
+          const pid = this.connectionInfo.editorPid;
+          if (!this.connectionInfo.openedByAServer && pid !== undefined && this.oneShotReader !== null) {
+            this.identify(pid);
+            return;
+          }
           this.emitBridgeEvent("godot_connected", { projectPath: message.project_path });
         }
         return;
@@ -28071,6 +28117,45 @@ class GodotBridge extends EventEmitter {
     this.stopKeepalive();
     stranger?.close(OTHER_PROJECT_CLOSE_CODE, said);
   }
+  identify(pid) {
+    const known = this.oneShots.get(pid);
+    if (known !== undefined) {
+      this.turnAway(pid, known);
+      return;
+    }
+    const info = this.connectionInfo;
+    const socket = this.socket;
+    const reader = this.oneShotReader;
+    if (info === null || reader === null) {
+      return;
+    }
+    info.identifying = true;
+    reader(pid).catch(() => {
+      return;
+    }).then((option) => {
+      if (this.socket !== socket || this.connectionInfo !== info) {
+        return;
+      }
+      if (typeof option === "string") {
+        this.oneShots.set(pid, option);
+        this.turnAway(pid, option);
+        return;
+      }
+      info.identifying = false;
+      this.log("info", `Godot editor identified: pid ${pid}`);
+      this.emitBridgeEvent("godot_connected", { projectPath: info.projectPath });
+    });
+  }
+  turnAway(pid, option) {
+    const said = `pid ${pid} was started with ${option}, which does one job and quits, so it is not an editor`;
+    this.log("info", `Turning away an engine run: ${said}`);
+    this.turnedAway = { pid, option, at: new Date };
+    const run = this.socket;
+    this.socket = null;
+    this.connectionInfo = null;
+    this.stopKeepalive();
+    run?.close(ONE_SHOT_CLOSE_CODE, said);
+  }
   handleDisconnect(disconnectedSocket, reason) {
     if (disconnectedSocket && this.socket && disconnectedSocket !== this.socket) {
       this.log("debug", "Ignoring stale Godot socket disconnect event");
@@ -31601,7 +31686,7 @@ var TOOL_SPECS = [
   },
   {
     name: "editor_status",
-    description: "Whether the editor addon is connected, which Godot answers, whether the editor is playing something, and whether a game with the runtime addon is reachable: runtimeConnected counts the games of the project this server serves, and runtimes lists every game on the machine with ofThisProject saying which is which, since a game of another project is reached only by naming its projectPath. playingInEditor is null when the editor was not asked or did not answer, which is not the same as a no: with no editor connected there is nobody to ask, and an editor that does not serve the question is given a moment and then left. A game can be playing while this is null, so read it as unanswered rather than as nothing playing, and use processActive and runtimes, which come from elsewhere and do not depend on the editor answering. game.run names the run processActive is about, the one editor_output and editor_run stop answer for: its pid, its project, and adopted true when this server read it back from another server rather than starting it; null when there is none. editor.scan says whether the editor is scanning or importing and how many milliseconds ago its last scan finished (finishedMsAgo), or is null when it did not answer: the editor rewrites the class cache just after a scan, and editor_run waits that out before starting a game, saying so under waitedForEditorScanMs. Each game under runtimes is pinged with a short wait, so one held at a breakpoint is listed as unreachable rather than making this call wait out the runtime timeout; for the run this server is reporting on, heldAt says whether that is what it is, with the same three answers editor_output gives. A game the editor played announces the editor under editorPid, and so does whatever that game started for itself; a game some other server started announces none, which is how the two are told apart when both are running from one project. Each game also says which runtime addon it loaded, under addonVersion (null when it cannot say); addonIsStale is true when that code is not what this server ships, and staleNote says whether the project needs gdharness upgrade, the game a restart, or this server a reconnect. A second checkout of a project, such as a git worktree, carries addons of its own and is where this shows. Every runtime_* answer from such a game carries addonIsStale and staleNote too. When connected is false, mayYetConnect says whether that is final: the editor dials this server rather than the other way round and backs off between tries, so for the first half-minute after a server starts, false means \"not reached yet\" as often as it means \"no editor\". True is worth waiting out; false is an editor that is not there. False beside restartInterrupted is one that an editor_launch restart on a previous server asked to quit, where the launch half never ran because that server was ended in between, usually by the reconnect the restart was taken for; editor_launch open finishes it. True beside restartUnderway is a restart still in progress, its server alive and within the wait for the old editor to go: the editor is coming, and opening another would put two on one project. listeningSince is when this server took the bridge port, which is what that window is measured from and what a caller wanting its own window should read. An editor this server opened counts for as long as its process lives, however far past that window the import runs, and awaitingLaunchedEditor names its pid so the two reasons for true are told apart. settingsDropped appears here once when the editor this server opened saved project.godot on its way in, which is the same reading editor_launch restart makes in its own answer. A game that has announced itself in a protocol this server does not speak is listed under unreadable rather than left out, with the protocol it speaks and whether the server or the addon is the older half. This happens during an upgrade that moves the runtime protocol, which most do not: installing replaces the addon on disk as soon as the pin moves, while a server that is already running stays on the version it started with, so the two speak different protocols until the server is reconnected. Those games are real and running, but no tool here can reach them until the halves match, so runtimes stays empty and runtimeConnected stays false. An upgrade that leaves the protocol alone opens no such window and this list stays empty through it. addonIsStale is decided by the code of the editor addons rather than their version, so an editor started before an upgrade that left that code alone reports the older addonVersion, is not stale, and addonNote says so: it needs no restart. port is the one the editor bridge is on; when that is not the one this server was configured with, portWanted names the configured one and portNote says why it moved and, when it was the server this one replaced, which pid kept it. A server replacing another of its project that holds the configured port waits for it to stand down and takes the port over, which takes a few seconds; bridgeHandover says so while it waits, and it moves only if that server has not let go within the wait. An editor that has connected and not yet greeted, which lasts a frame and longer while it imports, reports nothing about itself: greeting says so, addonIsStale is absent rather than guessed, and a restart asked then waits for the greeting to learn who opened it. startedByAnEditor is an editor another editor started, by Godot's own restart or the project manager, which has none of the arguments a server gave the one before it; startedByAnEditorNote says what that costs.",
+    description: "Whether the editor addon is connected, which Godot answers, whether the editor is playing something, and whether a game with the runtime addon is reachable: runtimeConnected counts the games of the project this server serves, and runtimes lists every game on the machine with ofThisProject saying which is which, since a game of another project is reached only by naming its projectPath. playingInEditor is null when the editor was not asked or did not answer, which is not the same as a no: with no editor connected there is nobody to ask, and an editor that does not serve the question is given a moment and then left. A game can be playing while this is null, so read it as unanswered rather than as nothing playing, and use processActive and runtimes, which come from elsewhere and do not depend on the editor answering. game.run names the run processActive is about, the one editor_output and editor_run stop answer for: its pid, its project, and adopted true when this server read it back from another server rather than starting it; null when there is none. editor.scan says whether the editor is scanning or importing and how many milliseconds ago its last scan finished (finishedMsAgo), or is null when it did not answer: the editor rewrites the class cache just after a scan, and editor_run waits that out before starting a game, saying so under waitedForEditorScanMs. Each game under runtimes is pinged with a short wait, so one held at a breakpoint is listed as unreachable rather than making this call wait out the runtime timeout; for the run this server is reporting on, heldAt says whether that is what it is, with the same three answers editor_output gives. A game the editor played announces the editor under editorPid, and so does whatever that game started for itself; a game some other server started announces none, which is how the two are told apart when both are running from one project. Each game also says which runtime addon it loaded, under addonVersion (null when it cannot say); addonIsStale is true when that code is not what this server ships, and staleNote says whether the project needs gdharness upgrade, the game a restart, or this server a reconnect. A second checkout of a project, such as a git worktree, carries addons of its own and is where this shows. Every runtime_* answer from such a game carries addonIsStale and staleNote too. When connected is false, mayYetConnect says whether that is final: the editor dials this server rather than the other way round and backs off between tries, so for the first half-minute after a server starts, false means \"not reached yet\" as often as it means \"no editor\". True is worth waiting out; false is an editor that is not there. False beside restartInterrupted is one that an editor_launch restart on a previous server asked to quit, where the launch half never ran because that server was ended in between, usually by the reconnect the restart was taken for; editor_launch open finishes it. True beside restartUnderway is a restart still in progress, its server alive and within the wait for the old editor to go: the editor is coming, and opening another would put two on one project. listeningSince is when this server took the bridge port, which is what that window is measured from and what a caller wanting its own window should read. An editor this server opened counts for as long as its process lives, however far past that window the import runs, and awaitingLaunchedEditor names its pid so the two reasons for true are told apart. settingsDropped appears here once when the editor this server opened saved project.godot on its way in, which is the same reading editor_launch restart makes in its own answer. A game that has announced itself in a protocol this server does not speak is listed under unreadable rather than left out, with the protocol it speaks and whether the server or the addon is the older half. This happens during an upgrade that moves the runtime protocol, which most do not: installing replaces the addon on disk as soon as the pin moves, while a server that is already running stays on the version it started with, so the two speak different protocols until the server is reconnected. Those games are real and running, but no tool here can reach them until the halves match, so runtimes stays empty and runtimeConnected stays false. An upgrade that leaves the protocol alone opens no such window and this list stays empty through it. addonIsStale is decided by the code of the editor addons rather than their version, so an editor started before an upgrade that left that code alone reports the older addonVersion, is not stale, and addonNote says so: it needs no restart. port is the one the editor bridge is on; when that is not the one this server was configured with, portWanted names the configured one and portNote says why it moved and, when it was the server this one replaced, which pid kept it. A server replacing another of its project that holds the configured port waits for it to stand down and takes the port over, which takes a few seconds; bridgeHandover says so while it waits, and it moves only if that server has not let go within the wait. An editor that has connected and not yet greeted, which lasts a frame and longer while it imports, reports nothing about itself: greeting says so, addonIsStale is absent rather than guessed, and a restart asked then waits for the greeting to learn who opened it. startedByAnEditor is an editor another editor started, by Godot's own restart or the project manager, which has none of the arguments a server gave the one before it; startedByAnEditorNote says what that costs. An engine run that loads the editor addon to do one job and quit, such as a gate's godot --headless --import, an export or a script, is not taken as the editor: a process that greets without a server's mark has its command line read first, and while that is read identifying is true and connected false; one started with such an option is turned away, and turnedAway names the last one, its pid and the option.",
     parameters: {},
     requires: []
   },
@@ -32839,6 +32924,7 @@ class GodotServer {
   constructor() {
     this.ownProject = envValue("GDHARNESS_PROJECT") ?? null;
     this.godotBridge = getDefaultBridge(this.ownProject);
+    this.godotBridge.identifyEditorsWith(oneShotOptionOf);
     this.godotBridge.on("godot_connected", () => {
       this.settleTheLaunchReading();
     });
@@ -35098,6 +35184,10 @@ class GodotServer {
     const dap = portFromEnvOrNull("GDHARNESS_DAP_PORT") ?? await freePort(DEFAULT_DAP_PORT);
     return { lsp, dap };
   }
+  editorOnTheBridge() {
+    const pid = this.godotBridge.getStatus().editorPid;
+    return pid === undefined ? "the editor on this bridge" : `the editor on this bridge (pid ${pid})`;
+  }
   async handleRunProject(args, op) {
     const project = this.project(args);
     if (!project.ok) {
@@ -35105,7 +35195,7 @@ class GodotServer {
     }
     const open = this.godotBridge.isConnected() ? this.godotBridge.getStatus().projectPath : undefined;
     if (op !== "check" && open !== undefined && open !== "" && !isSameDirectory(open, project.value.path)) {
-      return this.createErrorResponse(`This start names ${project.value.path}, and the editor on this bridge has ${open} open.`, [
+      return this.createErrorResponse(`This start names ${project.value.path}, and ${this.editorOnTheBridge()} has ${open} open.`, [
         "editor_status names the project this server's editor is showing",
         "One server serves one editor: start a second server for the other project"
       ]);
@@ -36822,7 +36912,7 @@ class GodotServer {
     const open = this.godotBridge.getStatus().projectPath;
     const meant = readNonEmptyString(args, "projectPath");
     if (open !== undefined && open !== "" && meant !== undefined && !isSameDirectory(open, meant)) {
-      return this.createErrorResponse(`This call names ${meant}, and the editor on this bridge has ${open} open.`, [
+      return this.createErrorResponse(`This call names ${meant}, and ${this.editorOnTheBridge()} has ${open} open.`, [
         "editor_status names the project this server's editor is showing",
         "One server serves one editor: start a second server for the other project"
       ]);

package/package.json

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