gdharness 0.13.40 → 0.13.42

package/build/cli.js

@@ -15393,7 +15393,7 @@ var init_tool_definitions = __esm(() => {
   };
   RUNNING_PID = {
     type: "number",
-    description: "Which game, when several are running from one project, such as a bench and its workers: its process id, as editor_status lists under runtimes. Not needed with one game per project."
+    description: "Which game, when several are running from one project, such as a bench and its workers: its process id, as editor_status lists under runtimes. Without it the game this server started or plays is the one asked when it is among them, and the answer says so under answeredBy; with one game per project it is not needed at all."
   };
   SCENE_PATH = {
     type: "string",
@@ -16011,6 +16011,11 @@ var init_tool_definitions = __esm(() => {
           type: "number",
           ops: ["check", "wait"],
           description: "check: how long to give the boot before it is called hung. Default 60000. wait: how long to wait for the run to end before answering anyway. Default 600000."
+        },
+        andChildren: {
+          type: "boolean",
+          ops: ["stop"],
+          description: "stop: also end what the game started for itself, with OS.create_process or otherwise, such as a bench's workers. Only the children of the run's process that are announced as games of this project are ended, named under endedChildren; any other child is left and named under childrenLeft. Default false, and the run's process is ended either way."
         }
       },
       requires: [],
@@ -16020,7 +16025,7 @@ var init_tool_definitions = __esm(() => {
           requires: ["projectPath"]
         },
         stop: {
-          summary: "end the run and answer with what it printed last, naming the process ended under endedPid: a game that started processes of its own keeps them",
+          summary: "end the run and answer with what it printed last, naming the process ended under endedPid: a game that started processes of its own keeps them unless andChildren says to end those too",
           requires: []
         },
         check: {
@@ -16061,7 +16066,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. 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. 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. 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. 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.",
+      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. 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. 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. 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. 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.",
       parameters: {},
       requires: []
     },
@@ -36413,23 +36418,55 @@ var init_lsp_client = __esm(() => {
   init_ports();
 });
 
-// src/process-time.ts
+// src/process-children.ts
 import { execFile as execFile5 } from "node:child_process";
 import { promisify as promisify5 } from "node:util";
+async function childrenOf(pid) {
+  try {
+    const printed = process.platform === "win32" ? await askWindows(pid) : await askPosix(pid);
+    return printed.split(/\r?\n/).map((line) => Number(line.trim())).filter((child) => Number.isInteger(child) && child > 0);
+  } catch (error) {
+    if (process.platform !== "win32" && error.code === 1) {
+      return [];
+    }
+    return;
+  }
+}
+async function askWindows(pid) {
+  const { stdout } = await run5("powershell.exe", [
+    "-NoProfile",
+    "-NonInteractive",
+    "-Command",
+    `(Get-CimInstance Win32_Process -Filter "ParentProcessId=${pid}").ProcessId`
+  ], { timeout: ASK_TIMEOUT_MS, windowsHide: true });
+  return stdout;
+}
+async function askPosix(pid) {
+  const { stdout } = await run5("pgrep", ["-P", String(pid)], { timeout: ASK_TIMEOUT_MS });
+  return stdout;
+}
+var run5, ASK_TIMEOUT_MS = 15000;
+var init_process_children = __esm(() => {
+  run5 = promisify5(execFile5);
+});
+
+// src/process-time.ts
+import { execFile as execFile6 } from "node:child_process";
+import { promisify as promisify6 } from "node:util";
 async function cpuSecondsOf(pid) {
   try {
-    return process.platform === "win32" ? await askWindows(pid) : await askPosix(pid);
+    return process.platform === "win32" ? await askWindows2(pid) : await askPosix2(pid);
   } catch {
     return;
   }
 }
-async function askWindows(pid) {
-  const { stdout } = await run5("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", `(Get-Process -Id ${pid}).CPU`], { timeout: ASK_TIMEOUT_MS, windowsHide: true });
+async function askWindows2(pid) {
+  const { stdout } = await run6("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", `(Get-Process -Id ${pid}).CPU`], { timeout: ASK_TIMEOUT_MS2, windowsHide: true });
   const seconds = Number(stdout.trim().replace(",", "."));
   return Number.isFinite(seconds) ? seconds : undefined;
 }
-async function askPosix(pid) {
-  const { stdout } = await run5("ps", ["-o", "time=", "-p", String(pid)], { timeout: ASK_TIMEOUT_MS });
+async function askPosix2(pid) {
+  const { stdout } = await run6("ps", ["-o", "time=", "-p", String(pid)], { timeout: ASK_TIMEOUT_MS2 });
   return secondsFromClock(stdout.trim());
 }
 function secondsFromClock(printed) {
@@ -36447,9 +36484,9 @@ function secondsFromClock(printed) {
   const extra = days === null ? 0 : Number(days) * 86400;
   return Number.isFinite(extra) ? seconds + extra : undefined;
 }
-var run5, ASK_TIMEOUT_MS = 2000;
+var run6, ASK_TIMEOUT_MS2 = 6000;
 var init_process_time = __esm(() => {
-  run5 = promisify5(execFile5);
+  run6 = promisify6(execFile6);
 });
 
 // src/project-scan.ts
@@ -36676,7 +36713,18 @@ function parseAnnouncement(file, pid) {
   if (protocol !== RUNTIME_PROTOCOL) {
     return { kind: "unspoken", unspoken: { pid, protocol: protocol ?? 0, project: named } };
   }
-  return { kind: "runtime", endpoint: { pid, port, address, project: named, file } };
+  const editorPid = readNumber(fields, "editor_pid");
+  return {
+    kind: "runtime",
+    endpoint: {
+      pid,
+      port,
+      address,
+      project: named,
+      file,
+      ...editorPid !== undefined && Number.isInteger(editorPid) && editorPid > 0 ? { editorPid } : {}
+    }
+  };
 }
 function runtimesAnnounced(directories = runtimeDirectories()) {
   const running = new Map;
@@ -36750,7 +36798,7 @@ async function announcedSince(projectPath, before, waiting = {}) {
   const directories = waiting.directories ?? runtimeDirectories();
   const until = Date.now() + Math.max(waiting.budgetMs ?? ANNOUNCE_BUDGET_MS, 0);
   for (;; ) {
-    const fresh = discoverRuntimes(directories).find((endpoint) => !before.has(endpoint.pid) && resolve4(endpoint.project.path) === wanted);
+    const fresh = discoverRuntimes(directories).find((endpoint) => !before.has(endpoint.pid) && resolve4(endpoint.project.path) === wanted && (waiting.accept?.(endpoint) ?? true));
     if (fresh !== undefined) {
       return fresh;
     }
@@ -37205,7 +37253,7 @@ var init_run_record = __esm(() => {
 });
 
 // src/server.ts
-import { execFile as execFile6, spawn } from "node:child_process";
+import { execFile as execFile7, spawn } from "node:child_process";
 import { randomUUID as randomUUID2 } from "node:crypto";
 import {
   appendFileSync,
@@ -37223,7 +37271,7 @@ import { tmpdir as tmpdir5 } from "node:os";
 import { basename as basename3, dirname as dirname11, join as join19, normalize as normalize3, relative as relative3 } from "node:path";
 import { setTimeout as delay3 } from "node:timers/promises";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
-import { promisify as promisify6 } from "node:util";
+import { promisify as promisify7 } from "node:util";
 function patienceForFrames(frames, atLeast) {
   return Math.max(atLeast, frames / SLOWEST_FRAME_RATE * 1000 + atLeast);
 }
@@ -37274,6 +37322,18 @@ function endedPreviousRun(ended) {
   }
   return ended.pid ?? true;
 }
+function aboutTheChildren(ended, throughEditor) {
+  if (ended === null) {
+    return throughEditor ? "Anything that game started for itself, with OS.create_process or otherwise, is not the editor's to stop and is still running; andChildren ends what it started that is announced as a game of this project." : "Anything that game started for itself, with OS.create_process or otherwise, is a separate process and is still running; andChildren ends what it started that is announced as a game of this project.";
+  }
+  if (ended.unknown) {
+    return "andChildren was asked for and this platform would not list what the game had started, so nothing else was ended.";
+  }
+  const counted = (n) => `${n} ${n === 1 ? "process" : "processes"}`;
+  const endedToo = ended.ended.length === 0 ? "The game had started nothing announced as a game of this project, so nothing else was ended." : `${counted(ended.ended.length)} the game had started for itself, announced as games of this project, ${ended.ended.length === 1 ? "was" : "were"} ended with it, named under endedChildren.`;
+  const leftToo = ended.left.length === 0 ? "" : ` ${counted(ended.left.length)} it had started ${ended.left.length === 1 ? "was" : "were"} left, named under childrenLeft: not announced as a game of this project, so what ${ended.left.length === 1 ? "it is" : "they are"} cannot be told from here.`;
+  return `${endedToo}${leftToo}`;
+}
 function endedToStartThis(ended) {
   if (ended === null) {
     return "";
@@ -37425,6 +37485,16 @@ function hasMainScene(projectFile) {
   const scene = parseProjectGodot(readFileSync17(projectFile, "utf8"))["application"]?.["run/main_scene"];
   return typeof scene === "string" && scene !== "";
 }
+function runtimeAddonAnnouncesEditors(projectPath) {
+  if (projectPath === null) {
+    return false;
+  }
+  try {
+    return readFileSync17(join19(projectPath, RUNTIME_AUTOLOAD2.path), "utf8").includes('"editor_pid"');
+  } catch {
+    return false;
+  }
+}
 function editorPlaysHeadless(projectFile) {
   const runArgs = parseProjectGodot(readFileSync17(projectFile, "utf8"))["editor"]?.["run/main_run_args"];
   return typeof runArgs === "string" && /(?:^|\s)--headless(?:\s|$)/.test(runArgs);
@@ -37963,7 +38033,7 @@ class GodotServer {
         return op === "restart" ? await this.handleRestartEditor() : await this.handleLaunchEditor(args);
       case "editor_run":
         if (op === "stop") {
-          return await this.handleStopProject();
+          return await this.handleStopProject(args);
         }
         if (op === "wait") {
           return await this.handleWaitForRun(args);
@@ -38406,7 +38476,7 @@ class GodotServer {
     const log = new GameLog;
     let exitCode = 0;
     try {
-      const { stdout, stderr } = await run6(engine.value, exportArgs, { timeout: 300000 });
+      const { stdout, stderr } = await run7(engine.value, exportArgs, { timeout: 300000 });
       log.append("stdout", stdout);
       log.append("stderr", stderr);
     } catch (error) {
@@ -38603,7 +38673,7 @@ class GodotServer {
   }
   async godotVersion(godotPath) {
     try {
-      const { stdout } = await run6(godotPath, ["--version"], { timeout: 1e4 });
+      const { stdout } = await run7(godotPath, ["--version"], { timeout: 1e4 });
       this.lastGodotVersion = stdout.trim();
       return this.lastGodotVersion;
     } catch (error) {
@@ -38862,7 +38932,7 @@ class GodotServer {
     const located = await this.locator.find();
     const announced = runtimesAnnounced();
     const pinged = Promise.all(announced.running.map(async (endpoint) => {
-      const held = this.knownHoldOn(endpoint);
+      const held = this.knownHoldOn(endpoint, announced.running);
       const reply = held === null ? await runtimeRequest(endpoint, "ping", {}, HOLD_PING_MS) : {
         ok: false,
         message: `The game is held by the editor's debugger, ${describeHalt(held)}, and answers no runtime call while it is. debug_control continue lets it go.`
@@ -38871,6 +38941,7 @@ class GodotServer {
         pid: endpoint.pid,
         port: endpoint.port,
         project: endpoint.project,
+        editorPid: endpoint.editorPid,
         reachable: reply.ok,
         problem: reply.ok ? null : reply.message
       };
@@ -39166,6 +39237,7 @@ class GodotServer {
     let editorSaysGoing = true;
     const endpoint = await announcedSince(projectPath, before, {
       budgetMs,
+      accept: (one) => this.isTheGameOf(this.currentRun(), one, projectPath),
       giveUp: () => {
         if (this.dapClient?.isStopped() === true) {
           return true;
@@ -39471,18 +39543,50 @@ class GodotServer {
     };
     this.activeProcess = picked;
   }
-  announcedPidOf(run) {
+  announcedPidOf(run, announced) {
     if (!run.throughEditor || run.announcedPid !== undefined) {
       return run.announcedPid;
     }
     const before = run.announcedBefore ?? new Set;
-    const fresh = this.allAnnouncedForOurProject(runtimesAnnounced().running).filter((one) => !before.has(one.pid));
-    const theOne = fresh.length === 1 ? fresh[0] : undefined;
+    const fresh = this.allAnnouncedForOurProject(announced ?? runtimesAnnounced().running).filter((one) => !before.has(one.pid));
+    const candidates = fresh.filter((one) => this.playedByOurEditor(one, run.projectPath));
+    const theOne = candidates.length === 1 ? candidates[0] : undefined;
     if (theOne !== undefined) {
       run.announcedPid = theOne.pid;
     }
     return run.announcedPid;
   }
+  ownGameAmong(running, projectPath) {
+    const run = this.currentRun();
+    if (run === null || !stillRunning(run)) {
+      return;
+    }
+    if (projectPath !== undefined && run.projectPath !== null && !isSameDirectory(run.projectPath, projectPath)) {
+      return;
+    }
+    const its = run.throughEditor ? this.announcedPidOf(run, running) : run.pid;
+    return its !== null && its !== undefined && running.some((one) => one.pid === its) ? its : undefined;
+  }
+  playedByOurEditor(endpoint, projectPath) {
+    const editor = this.godotBridge.getStatus().editorPid;
+    if (editor === undefined) {
+      return true;
+    }
+    if (endpoint.editorPid !== undefined) {
+      return endpoint.editorPid === editor;
+    }
+    return !runtimeAddonAnnouncesEditors(projectPath ?? this.ownProject);
+  }
+  isTheGameOf(run, endpoint, projectPath) {
+    if (run === null) {
+      return false;
+    }
+    if (run.throughEditor) {
+      return this.playedByOurEditor(endpoint, projectPath);
+    }
+    const editor = this.godotBridge.getStatus().editorPid;
+    return endpoint.editorPid === undefined || endpoint.editorPid !== editor;
+  }
   adoptRecordedRun() {
     const record = readRunRecord();
     if (record === null || !this.couldBeOurs(record.projectPath)) {
@@ -39626,6 +39730,9 @@ class GodotServer {
     if (announced !== undefined && !alive(announced)) {
       return false;
     }
+    if (announced !== undefined && editorSays === undefined) {
+      return stillRunning(run);
+    }
     return runIsUp(run, editorSays === undefined ? (await this.editorPlayingState())?.playing ?? null : editorSays);
   }
   async handleGetDebugOutput(args, waitedMs) {
@@ -39699,7 +39806,7 @@ class GodotServer {
       entries: forAnswer(selected.entries)
     });
   }
-  async handleStopProject() {
+  async handleStopProject(args) {
     await this.pickUpWhatTheEditorIsPlaying();
     const stopped = this.currentRun();
     if (!stopped) {
@@ -39708,21 +39815,48 @@ class GodotServer {
     this.drainEditorOutput(stopped);
     this.drainTranscript(stopped);
     const wasRunning = await this.runStillGoing(stopped);
+    const endedPid = stopped.pid ?? this.announcedPidOf(stopped) ?? null;
+    const children = readBoolean(args, "andChildren") === true && wasRunning && endedPid !== null ? await childrenOf(endedPid) : null;
     this.logDebug("Stopping the running game");
     await this.endActiveGame("editor_run stop");
+    const ended = children === null ? null : this.endChildrenAmong(children, stopped.projectPath);
     return this.jsonTextResponse({
       stopped: true,
       through: stopped.throughEditor ? "editor" : "gdharness",
-      endedPid: stopped.pid ?? this.announcedPidOf(stopped) ?? null,
+      endedPid,
+      ...ended === null ? {} : {
+        endedChildren: ended.ended,
+        childrenLeft: ended.left.length === 0 ? undefined : ended.left,
+        childrenUnknown: ended.unknown ? true : undefined
+      },
       exitedBeforeStop: stopped.exitCode !== null || !wasRunning,
       exitCode: stopped.exitCode,
       errors: stopped.log.count("error"),
       warnings: stopped.log.count("warning"),
       clean: stopped.log.count("error") === 0,
-      note: !wasRunning ? "This run was over before the stop, so nothing was ended here: editor_output has what it printed and how it ended. Anything that game started for itself, with OS.create_process or otherwise, is a separate process and may still be running." : stopped.throughEditor ? "The editor was asked to stop the scene it is playing. Anything that game started for itself, with OS.create_process or otherwise, is not the editor's to stop and is still running." : "The process named under endedPid was ended. Anything that game started for itself, with OS.create_process or otherwise, is a separate process and is still running.",
+      note: !wasRunning ? "This run was over before the stop, so nothing was ended here: editor_output has what it printed and how it ended. Anything that game started for itself, with OS.create_process or otherwise, is a separate process and may still be running." : `${stopped.throughEditor ? "The editor was asked to stop the scene it is playing." : "The process named under endedPid was ended."} ${aboutTheChildren(ended, stopped.throughEditor)}`,
       entries: forAnswer(stopped.log.select({ severity: "warning", sinceLastCall: false, limit: 200 }).entries)
     });
   }
+  endChildrenAmong(children, projectPath) {
+    if (children === undefined) {
+      return { ended: [], left: [], unknown: true };
+    }
+    const games = new Set(runtimesAnnounced().running.filter((one) => projectPath === null || isSameDirectory(one.project.path, projectPath)).map((one) => one.pid));
+    const ended = [];
+    const left = [];
+    for (const child of children) {
+      if (!games.has(child)) {
+        left.push(child);
+        continue;
+      }
+      try {
+        process.kill(child);
+        ended.push(child);
+      } catch {}
+    }
+    return { ended, left, unknown: false };
+  }
   async handleRescanFilesystem(args) {
     const timeoutMs = readPositiveNumber(args, "timeoutMs") ?? 30000;
     const started = Date.now();
@@ -39870,13 +40004,13 @@ class GodotServer {
     const override = Number.parseInt(envValue("GDHARNESS_RUNTIME_TIMEOUT_MS") ?? "", 10);
     return Number.isInteger(override) && override > 0 ? override : 1e4;
   }
-  knownHoldOn(endpoint) {
+  knownHoldOn(endpoint, announced) {
     const run = this.activeProcess;
     const session = this.dapClient;
     if (run === null || !run.throughEditor || !stillRunning(run) || session === null) {
       return null;
     }
-    if (this.announcedPidOf(run) !== endpoint.pid || !session.holdIsKnown()) {
+    if (this.announcedPidOf(run, announced) !== endpoint.pid || !session.holdIsKnown()) {
       return null;
     }
     return session.whereItStopped();
@@ -39917,11 +40051,16 @@ class GodotServer {
   async handleRuntimeCommand(command, args, timeoutMs = this.runtimeTimeoutMs()) {
     const { op: _op, projectPath, pid, ...params } = asParams(args);
     const announced = runtimesAnnounced();
-    const choice = chooseRuntime(announced.running, typeof projectPath === "string" ? projectPath : this.ownProject ?? undefined, announced.unspoken, typeof pid === "number" ? pid : undefined);
+    const wanted = typeof projectPath === "string" ? projectPath : this.ownProject ?? undefined;
+    const own = typeof pid === "number" ? undefined : this.ownGameAmong(announced.running, wanted);
+    const choice = chooseRuntime(announced.running, wanted, announced.unspoken, typeof pid === "number" ? pid : own);
     if ("problem" in choice) {
       return this.createErrorResponse(choice.problem);
     }
-    const held = this.knownHoldOn(choice.endpoint);
+    const ofProject = announced.running.filter((one) => wanted === undefined || isSameDirectory(one.project.path, wanted));
+    const chosenAmongSeveral = own !== undefined && ofProject.length > 1;
+    const answeredBy = chosenAmongSeveral ? { answeredBy: own } : {};
+    const held = this.knownHoldOn(choice.endpoint, announced.running);
     if (held !== null) {
       return this.createErrorResponse(`The game (pid ${choice.endpoint.pid}) is held by the editor's debugger, ${describeHalt(held)}, and answers no runtime call while it is.`, [
         "debug_control continue lets it go, after which this call answers",
@@ -39939,7 +40078,7 @@ class GodotServer {
       }
       const { id: _id, ...payload } = reply.payload;
       if (!expectsScreenshot) {
-        return this.jsonTextResponse(payload);
+        return this.jsonTextResponse({ ...payload, ...answeredBy });
       }
       const returnedPath = readString(payload, "path");
       if (readString(payload, "type") !== "screenshot_file" || !returnedPath || !screenshotPath) {
@@ -39951,7 +40090,10 @@ class GodotServer {
       const dimensions = `${readNumber(payload, "width") ?? 0}x${readNumber(payload, "height") ?? 0} ${readString(payload, "format") ?? "unknown"}`;
       return {
         content: [
-          { type: "text", text: `Screenshot captured: ${dimensions}` },
+          {
+            type: "text",
+            text: `Screenshot captured: ${dimensions}${chosenAmongSeveral ? ` from pid ${own}, the game this server holds` : ""}`
+          },
           { type: "image", data: readFileSync17(screenshotPath).toString("base64"), mimeType: "image/png" }
         ]
       };
@@ -40018,7 +40160,7 @@ async function runGodotServer() {
   const server = new GodotServer;
   await server.run();
 }
-var UPDATE_NOTICE_EVERY = 500, FEEDBACK_NOTICE_EVERY = 250, run6, __dirname2, EDITOR_RESTART_TIMEOUT_MS = 90000, HOLD_PING_MS = 2000, SLOWEST_FRAME_RATE = 20, VALUE_NAMES, BRIDGE_RETRY_MS = 2000, SUCCESSOR_CHECK_MS = 1e4, CACHE_WRITE_MS = 2000, PLAYING_STATUS_MS = 1000, SCAN_START_MS = 2000, WAIT_FOR_RUN_MS = 600000, RUN_POLL_MS = 250, PATH_SOLUTIONS, PROJECT_FILE_ARGUMENTS, DEBUG_STATE_CALLS, PROJECT_INFO_SECTIONS2, RUNNER_DIRECTORY = "addons/gdUnit4/";
+var UPDATE_NOTICE_EVERY = 500, FEEDBACK_NOTICE_EVERY = 250, run7, __dirname2, EDITOR_RESTART_TIMEOUT_MS = 90000, HOLD_PING_MS = 2000, SLOWEST_FRAME_RATE = 20, VALUE_NAMES, BRIDGE_RETRY_MS = 2000, SUCCESSOR_CHECK_MS = 1e4, CACHE_WRITE_MS = 2000, PLAYING_STATUS_MS = 1000, SCAN_START_MS = 2000, WAIT_FOR_RUN_MS = 600000, RUN_POLL_MS = 250, PATH_SOLUTIONS, PROJECT_FILE_ARGUMENTS, DEBUG_STATE_CALLS, PROJECT_INFO_SECTIONS2, RUNNER_DIRECTORY = "addons/gdUnit4/";
 var init_server3 = __esm(() => {
   init_mcp();
   init_stdio2();
@@ -40039,6 +40181,7 @@ var init_server3 = __esm(() => {
   init_lsp_client();
   init_paths();
   init_ports();
+  init_process_children();
   init_process_time();
   init_project_scan();
   init_resources();
@@ -40050,7 +40193,7 @@ var init_server3 = __esm(() => {
   init_setup();
   init_tool_definitions();
   init_update_check();
-  run6 = promisify6(execFile6);
+  run7 = promisify7(execFile7);
   __dirname2 = dirname11(fileURLToPath4(import.meta.url));
   VALUE_NAMES = {
     string: "a string",
@@ -41561,8 +41704,10 @@ that is running, and the project on disk. ${TOOL_SPECS.length} tools, named \`do
 
 - ${projectPathSentence()}. The \`runtime_*\` and \`debug_*\` ones pick between running
   games instead, by \`projectPath\`, or by \`pid\` when several run from one project, as a bench
-  and its workers do; the others answer about the editor this server is connected to. There is no
-  ambient project, and an argument a tool does not declare is refused rather than ignored.
+  and its workers do: without \`pid\` the game this server started or plays is the one asked, and
+  the answer says so under \`answeredBy\`; the others answer about the editor this server is
+  connected to. There is no ambient project, and an argument a tool does not declare is refused
+  rather than ignored.
 - \`editor_status\` says whether an editor is connected and whether its addon matches the server.
   \`addonIsStale\` means they differ, and \`staleNote\` says which half is behind: an editor that
   needs restarting, or a server that needs reconnecting in your harness. Every answer that came
@@ -41607,6 +41752,7 @@ that is running, and the project on disk. ${TOOL_SPECS.length} tools, named \`do
 | Where a 3D node is on screen | \`runtime_inspect\` \`rect\`, rather than unprojecting by hand |
 | Wait for something in a running game | \`runtime_wait\`, never a sleep; \`until\` with \`says\` for a panel that rebuilds its own labels |
 | Wait for a run to finish | \`editor_run wait\`, never a sleep or a shell loop on the pid: it answers as \`editor_output\` does, once the run is over |
+| End a bench and the workers it opened | \`editor_run stop\` with \`andChildren\`, never a process listing by scene name: it ends the children of the run's process that are announced as games of the project, names them under \`endedChildren\`, and leaves and names any other child |
 | A picture, for a person who asked to see one | \`runtime_capture\` |
 
 These need the runtime autoload, which \`gdharness setup\` registers. \`runtime_capture\` needs a

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

@@ -43,6 +43,12 @@ const DAP_ASKED: String = "GDHARNESS_DAP_PORT"
 ## What a server that opened this editor says about itself, so that being opened by one is stated
 ## rather than guessed at from the ports. Kept in step with `OPENED_BY_A_SERVER` in src/launch.ts.
 const OPENED_BY_A_SERVER: String = "GDHARNESS_OPENED_BY_A_SERVER"
+## Put into this editor's own environment as it loads, so every game it plays inherits it and
+## the runtime addon can announce which editor played it. A game of the same project that some
+## other server started has no such variable, or another editor's number, and that is what
+## tells the two apart when both are announced at once. Kept in step with `EDITOR_PID_VARIABLE`
+## in the runtime autoload.
+const EDITOR_PID_VARIABLE: String = "GDHARNESS_EDITOR_PID"
 
 ## How long one attempt is given before the address is called a bad one.
 ##
@@ -93,6 +99,7 @@ func _ready() -> void:
 	_project_path = ProjectSettings.globalize_path("res://")
 	version_at_load = _loaded_version()
 	_keep_breakpoints_through_sessions()
+	OS.set_environment(EDITOR_PID_VARIABLE, str(OS.get_process_id()))
 
 	_reconnect_timer = Timer.new()
 	_reconnect_timer.one_shot = true

package/build/godot/addons/gdharness_runtime/runtime_autoload.gd

@@ -30,6 +30,12 @@ const SCRIPT_FLAGS: PackedStringArray = ["-s", "--script"]
 ## Serve a script run anyway, for somebody driving a `-s` script rather than a game.
 const SCRIPT_RUNS_SETTING: String = "gdharness/runtime/serve_script_runs"
 
+## The variable the editor addon puts into its own environment, which every game the editor plays
+## inherits: it says which editor played this game, so a server can tell the editor's game from
+## another of the same project that some other server started. Kept in step with
+## `EDITOR_PID_VARIABLE` in the editor addon's bridge client.
+const EDITOR_PID_VARIABLE: String = "GDHARNESS_EDITOR_PID"
+
 var values: Values = Values.new()
 
 # The modules are members and not locals of _init, because a Callable holds its object by id
@@ -250,7 +256,7 @@ func _announce(bind_address: String) -> void:
 ## What the announcement file and the welcome both carry: enough to pick this game out of
 ## several and to know whether the server speaks its protocol.
 func _identity(bind_address: String) -> Dictionary:
-	return {
+	var identity: Dictionary = {
 		"protocol": PROTOCOL,
 		"pid": OS.get_process_id(),
 		"port": _port,
@@ -262,6 +268,10 @@ func _identity(bind_address: String) -> Dictionary:
 		},
 		"godot": Engine.get_version_info().get("string", ""),
 	}
+	var played_by: String = OS.get_environment(EDITOR_PID_VARIABLE)
+	if played_by.is_valid_int():
+		identity["editor_pid"] = played_by.to_int()
+	return identity
 
 
 func _send_welcome(client: StreamPeerTCP) -> void:

package/build/index.js

@@ -10168,7 +10168,7 @@ function defectReport(where, error, context = {}) {
 }
 
 // src/server.ts
-import { execFile as execFile4, spawn } from "node:child_process";
+import { execFile as execFile5, spawn } from "node:child_process";
 import { randomUUID as randomUUID2 } from "node:crypto";
 import {
   appendFileSync,
@@ -10186,7 +10186,7 @@ import { tmpdir as tmpdir4 } from "node:os";
 import { basename as basename2, dirname as dirname6, join as join13, normalize as normalize2, relative as relative3 } from "node:path";
 import { setTimeout as delay3 } from "node:timers/promises";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-import { promisify as promisify4 } from "node:util";
+import { promisify as promisify5 } from "node:util";
 
 // node_modules/zod/v3/helpers/util.js
 var util;
@@ -27709,25 +27709,55 @@ async function handleLSPTool(client, toolName, args) {
   }
 }
 
-// src/process-time.ts
+// src/process-children.ts
 import { execFile as execFile3 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
 var run3 = promisify3(execFile3);
-var ASK_TIMEOUT_MS = 2000;
+var ASK_TIMEOUT_MS = 15000;
+async function childrenOf(pid) {
+  try {
+    const printed = process.platform === "win32" ? await askWindows(pid) : await askPosix(pid);
+    return printed.split(/\r?\n/).map((line) => Number(line.trim())).filter((child) => Number.isInteger(child) && child > 0);
+  } catch (error) {
+    if (process.platform !== "win32" && error.code === 1) {
+      return [];
+    }
+    return;
+  }
+}
+async function askWindows(pid) {
+  const { stdout } = await run3("powershell.exe", [
+    "-NoProfile",
+    "-NonInteractive",
+    "-Command",
+    `(Get-CimInstance Win32_Process -Filter "ParentProcessId=${pid}").ProcessId`
+  ], { timeout: ASK_TIMEOUT_MS, windowsHide: true });
+  return stdout;
+}
+async function askPosix(pid) {
+  const { stdout } = await run3("pgrep", ["-P", String(pid)], { timeout: ASK_TIMEOUT_MS });
+  return stdout;
+}
+
+// src/process-time.ts
+import { execFile as execFile4 } from "node:child_process";
+import { promisify as promisify4 } from "node:util";
+var run4 = promisify4(execFile4);
+var ASK_TIMEOUT_MS2 = 6000;
 async function cpuSecondsOf(pid) {
   try {
-    return process.platform === "win32" ? await askWindows(pid) : await askPosix(pid);
+    return process.platform === "win32" ? await askWindows2(pid) : await askPosix2(pid);
   } catch {
     return;
   }
 }
-async function askWindows(pid) {
-  const { stdout } = await run3("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", `(Get-Process -Id ${pid}).CPU`], { timeout: ASK_TIMEOUT_MS, windowsHide: true });
+async function askWindows2(pid) {
+  const { stdout } = await run4("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", `(Get-Process -Id ${pid}).CPU`], { timeout: ASK_TIMEOUT_MS2, windowsHide: true });
   const seconds = Number(stdout.trim().replace(",", "."));
   return Number.isFinite(seconds) ? seconds : undefined;
 }
-async function askPosix(pid) {
-  const { stdout } = await run3("ps", ["-o", "time=", "-p", String(pid)], { timeout: ASK_TIMEOUT_MS });
+async function askPosix2(pid) {
+  const { stdout } = await run4("ps", ["-o", "time=", "-p", String(pid)], { timeout: ASK_TIMEOUT_MS2 });
   return secondsFromClock(stdout.trim());
 }
 function secondsFromClock(printed) {
@@ -28270,7 +28300,18 @@ function parseAnnouncement(file, pid) {
   if (protocol !== RUNTIME_PROTOCOL) {
     return { kind: "unspoken", unspoken: { pid, protocol: protocol ?? 0, project: named } };
   }
-  return { kind: "runtime", endpoint: { pid, port, address, project: named, file } };
+  const editorPid = readNumber(fields, "editor_pid");
+  return {
+    kind: "runtime",
+    endpoint: {
+      pid,
+      port,
+      address,
+      project: named,
+      file,
+      ...editorPid !== undefined && Number.isInteger(editorPid) && editorPid > 0 ? { editorPid } : {}
+    }
+  };
 }
 function runtimesAnnounced(directories = runtimeDirectories()) {
   const running = new Map;
@@ -28349,7 +28390,7 @@ async function announcedSince(projectPath, before, waiting = {}) {
   const directories = waiting.directories ?? runtimeDirectories();
   const until = Date.now() + Math.max(waiting.budgetMs ?? ANNOUNCE_BUDGET_MS, 0);
   for (;; ) {
-    const fresh = discoverRuntimes(directories).find((endpoint) => !before.has(endpoint.pid) && resolve4(endpoint.project.path) === wanted);
+    const fresh = discoverRuntimes(directories).find((endpoint) => !before.has(endpoint.pid) && resolve4(endpoint.project.path) === wanted && (waiting.accept?.(endpoint) ?? true));
     if (fresh !== undefined) {
       return fresh;
     }
@@ -28837,7 +28878,7 @@ var RUNNING_PROJECT_PATH = {
 };
 var RUNNING_PID = {
   type: "number",
-  description: "Which game, when several are running from one project, such as a bench and its workers: its process id, as editor_status lists under runtimes. Not needed with one game per project."
+  description: "Which game, when several are running from one project, such as a bench and its workers: its process id, as editor_status lists under runtimes. Without it the game this server started or plays is the one asked when it is among them, and the answer says so under answeredBy; with one game per project it is not needed at all."
 };
 var SCENE_PATH = {
   type: "string",
@@ -29455,6 +29496,11 @@ var TOOL_SPECS = [
         type: "number",
         ops: ["check", "wait"],
         description: "check: how long to give the boot before it is called hung. Default 60000. wait: how long to wait for the run to end before answering anyway. Default 600000."
+      },
+      andChildren: {
+        type: "boolean",
+        ops: ["stop"],
+        description: "stop: also end what the game started for itself, with OS.create_process or otherwise, such as a bench's workers. Only the children of the run's process that are announced as games of this project are ended, named under endedChildren; any other child is left and named under childrenLeft. Default false, and the run's process is ended either way."
       }
     },
     requires: [],
@@ -29464,7 +29510,7 @@ var TOOL_SPECS = [
         requires: ["projectPath"]
       },
       stop: {
-        summary: "end the run and answer with what it printed last, naming the process ended under endedPid: a game that started processes of its own keeps them",
+        summary: "end the run and answer with what it printed last, naming the process ended under endedPid: a game that started processes of its own keeps them unless andChildren says to end those too",
         requires: []
       },
       check: {
@@ -29505,7 +29551,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. 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. 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. 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. 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.",
+    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. 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. 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. 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. 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.",
     parameters: {},
     requires: []
   },
@@ -29926,7 +29972,7 @@ function buildToolDefinitions() {
 // src/server.ts
 var UPDATE_NOTICE_EVERY = 500;
 var FEEDBACK_NOTICE_EVERY = 250;
-var run4 = promisify4(execFile4);
+var run5 = promisify5(execFile5);
 var __dirname2 = dirname6(fileURLToPath2(import.meta.url));
 var EDITOR_RESTART_TIMEOUT_MS = 90000;
 var HOLD_PING_MS = 2000;
@@ -29981,6 +30027,18 @@ function endedPreviousRun(ended) {
   }
   return ended.pid ?? true;
 }
+function aboutTheChildren(ended, throughEditor) {
+  if (ended === null) {
+    return throughEditor ? "Anything that game started for itself, with OS.create_process or otherwise, is not the editor's to stop and is still running; andChildren ends what it started that is announced as a game of this project." : "Anything that game started for itself, with OS.create_process or otherwise, is a separate process and is still running; andChildren ends what it started that is announced as a game of this project.";
+  }
+  if (ended.unknown) {
+    return "andChildren was asked for and this platform would not list what the game had started, so nothing else was ended.";
+  }
+  const counted = (n) => `${n} ${n === 1 ? "process" : "processes"}`;
+  const endedToo = ended.ended.length === 0 ? "The game had started nothing announced as a game of this project, so nothing else was ended." : `${counted(ended.ended.length)} the game had started for itself, announced as games of this project, ${ended.ended.length === 1 ? "was" : "were"} ended with it, named under endedChildren.`;
+  const leftToo = ended.left.length === 0 ? "" : ` ${counted(ended.left.length)} it had started ${ended.left.length === 1 ? "was" : "were"} left, named under childrenLeft: not announced as a game of this project, so what ${ended.left.length === 1 ? "it is" : "they are"} cannot be told from here.`;
+  return `${endedToo}${leftToo}`;
+}
 function endedToStartThis(ended) {
   if (ended === null) {
     return "";
@@ -30174,6 +30232,16 @@ function hasMainScene(projectFile) {
   const scene = parseProjectGodot(readFileSync13(projectFile, "utf8"))["application"]?.["run/main_scene"];
   return typeof scene === "string" && scene !== "";
 }
+function runtimeAddonAnnouncesEditors(projectPath) {
+  if (projectPath === null) {
+    return false;
+  }
+  try {
+    return readFileSync13(join13(projectPath, RUNTIME_AUTOLOAD.path), "utf8").includes('"editor_pid"');
+  } catch {
+    return false;
+  }
+}
 function editorPlaysHeadless(projectFile) {
   const runArgs = parseProjectGodot(readFileSync13(projectFile, "utf8"))["editor"]?.["run/main_run_args"];
   return typeof runArgs === "string" && /(?:^|\s)--headless(?:\s|$)/.test(runArgs);
@@ -30712,7 +30780,7 @@ class GodotServer {
         return op === "restart" ? await this.handleRestartEditor() : await this.handleLaunchEditor(args);
       case "editor_run":
         if (op === "stop") {
-          return await this.handleStopProject();
+          return await this.handleStopProject(args);
         }
         if (op === "wait") {
           return await this.handleWaitForRun(args);
@@ -31155,7 +31223,7 @@ class GodotServer {
     const log = new GameLog;
     let exitCode = 0;
     try {
-      const { stdout, stderr } = await run4(engine.value, exportArgs, { timeout: 300000 });
+      const { stdout, stderr } = await run5(engine.value, exportArgs, { timeout: 300000 });
       log.append("stdout", stdout);
       log.append("stderr", stderr);
     } catch (error) {
@@ -31352,7 +31420,7 @@ class GodotServer {
   }
   async godotVersion(godotPath) {
     try {
-      const { stdout } = await run4(godotPath, ["--version"], { timeout: 1e4 });
+      const { stdout } = await run5(godotPath, ["--version"], { timeout: 1e4 });
       this.lastGodotVersion = stdout.trim();
       return this.lastGodotVersion;
     } catch (error) {
@@ -31611,7 +31679,7 @@ class GodotServer {
     const located = await this.locator.find();
     const announced = runtimesAnnounced();
     const pinged = Promise.all(announced.running.map(async (endpoint) => {
-      const held = this.knownHoldOn(endpoint);
+      const held = this.knownHoldOn(endpoint, announced.running);
       const reply = held === null ? await runtimeRequest(endpoint, "ping", {}, HOLD_PING_MS) : {
         ok: false,
         message: `The game is held by the editor's debugger, ${describeHalt(held)}, and answers no runtime call while it is. debug_control continue lets it go.`
@@ -31620,6 +31688,7 @@ class GodotServer {
         pid: endpoint.pid,
         port: endpoint.port,
         project: endpoint.project,
+        editorPid: endpoint.editorPid,
         reachable: reply.ok,
         problem: reply.ok ? null : reply.message
       };
@@ -31915,6 +31984,7 @@ class GodotServer {
     let editorSaysGoing = true;
     const endpoint = await announcedSince(projectPath, before, {
       budgetMs,
+      accept: (one) => this.isTheGameOf(this.currentRun(), one, projectPath),
       giveUp: () => {
         if (this.dapClient?.isStopped() === true) {
           return true;
@@ -32220,18 +32290,50 @@ class GodotServer {
     };
     this.activeProcess = picked;
   }
-  announcedPidOf(run) {
+  announcedPidOf(run, announced) {
     if (!run.throughEditor || run.announcedPid !== undefined) {
       return run.announcedPid;
     }
     const before = run.announcedBefore ?? new Set;
-    const fresh = this.allAnnouncedForOurProject(runtimesAnnounced().running).filter((one) => !before.has(one.pid));
-    const theOne = fresh.length === 1 ? fresh[0] : undefined;
+    const fresh = this.allAnnouncedForOurProject(announced ?? runtimesAnnounced().running).filter((one) => !before.has(one.pid));
+    const candidates = fresh.filter((one) => this.playedByOurEditor(one, run.projectPath));
+    const theOne = candidates.length === 1 ? candidates[0] : undefined;
     if (theOne !== undefined) {
       run.announcedPid = theOne.pid;
     }
     return run.announcedPid;
   }
+  ownGameAmong(running, projectPath) {
+    const run = this.currentRun();
+    if (run === null || !stillRunning(run)) {
+      return;
+    }
+    if (projectPath !== undefined && run.projectPath !== null && !isSameDirectory(run.projectPath, projectPath)) {
+      return;
+    }
+    const its = run.throughEditor ? this.announcedPidOf(run, running) : run.pid;
+    return its !== null && its !== undefined && running.some((one) => one.pid === its) ? its : undefined;
+  }
+  playedByOurEditor(endpoint, projectPath) {
+    const editor = this.godotBridge.getStatus().editorPid;
+    if (editor === undefined) {
+      return true;
+    }
+    if (endpoint.editorPid !== undefined) {
+      return endpoint.editorPid === editor;
+    }
+    return !runtimeAddonAnnouncesEditors(projectPath ?? this.ownProject);
+  }
+  isTheGameOf(run, endpoint, projectPath) {
+    if (run === null) {
+      return false;
+    }
+    if (run.throughEditor) {
+      return this.playedByOurEditor(endpoint, projectPath);
+    }
+    const editor = this.godotBridge.getStatus().editorPid;
+    return endpoint.editorPid === undefined || endpoint.editorPid !== editor;
+  }
   adoptRecordedRun() {
     const record = readRunRecord();
     if (record === null || !this.couldBeOurs(record.projectPath)) {
@@ -32375,6 +32477,9 @@ class GodotServer {
     if (announced !== undefined && !alive(announced)) {
       return false;
     }
+    if (announced !== undefined && editorSays === undefined) {
+      return stillRunning(run);
+    }
     return runIsUp(run, editorSays === undefined ? (await this.editorPlayingState())?.playing ?? null : editorSays);
   }
   async handleGetDebugOutput(args, waitedMs) {
@@ -32448,7 +32553,7 @@ class GodotServer {
       entries: forAnswer(selected.entries)
     });
   }
-  async handleStopProject() {
+  async handleStopProject(args) {
     await this.pickUpWhatTheEditorIsPlaying();
     const stopped = this.currentRun();
     if (!stopped) {
@@ -32457,21 +32562,48 @@ class GodotServer {
     this.drainEditorOutput(stopped);
     this.drainTranscript(stopped);
     const wasRunning = await this.runStillGoing(stopped);
+    const endedPid = stopped.pid ?? this.announcedPidOf(stopped) ?? null;
+    const children = readBoolean(args, "andChildren") === true && wasRunning && endedPid !== null ? await childrenOf(endedPid) : null;
     this.logDebug("Stopping the running game");
     await this.endActiveGame("editor_run stop");
+    const ended = children === null ? null : this.endChildrenAmong(children, stopped.projectPath);
     return this.jsonTextResponse({
       stopped: true,
       through: stopped.throughEditor ? "editor" : "gdharness",
-      endedPid: stopped.pid ?? this.announcedPidOf(stopped) ?? null,
+      endedPid,
+      ...ended === null ? {} : {
+        endedChildren: ended.ended,
+        childrenLeft: ended.left.length === 0 ? undefined : ended.left,
+        childrenUnknown: ended.unknown ? true : undefined
+      },
       exitedBeforeStop: stopped.exitCode !== null || !wasRunning,
       exitCode: stopped.exitCode,
       errors: stopped.log.count("error"),
       warnings: stopped.log.count("warning"),
       clean: stopped.log.count("error") === 0,
-      note: !wasRunning ? "This run was over before the stop, so nothing was ended here: editor_output has what it printed and how it ended. Anything that game started for itself, with OS.create_process or otherwise, is a separate process and may still be running." : stopped.throughEditor ? "The editor was asked to stop the scene it is playing. Anything that game started for itself, with OS.create_process or otherwise, is not the editor's to stop and is still running." : "The process named under endedPid was ended. Anything that game started for itself, with OS.create_process or otherwise, is a separate process and is still running.",
+      note: !wasRunning ? "This run was over before the stop, so nothing was ended here: editor_output has what it printed and how it ended. Anything that game started for itself, with OS.create_process or otherwise, is a separate process and may still be running." : `${stopped.throughEditor ? "The editor was asked to stop the scene it is playing." : "The process named under endedPid was ended."} ${aboutTheChildren(ended, stopped.throughEditor)}`,
       entries: forAnswer(stopped.log.select({ severity: "warning", sinceLastCall: false, limit: 200 }).entries)
     });
   }
+  endChildrenAmong(children, projectPath) {
+    if (children === undefined) {
+      return { ended: [], left: [], unknown: true };
+    }
+    const games = new Set(runtimesAnnounced().running.filter((one) => projectPath === null || isSameDirectory(one.project.path, projectPath)).map((one) => one.pid));
+    const ended = [];
+    const left = [];
+    for (const child of children) {
+      if (!games.has(child)) {
+        left.push(child);
+        continue;
+      }
+      try {
+        process.kill(child);
+        ended.push(child);
+      } catch {}
+    }
+    return { ended, left, unknown: false };
+  }
   async handleRescanFilesystem(args) {
     const timeoutMs = readPositiveNumber(args, "timeoutMs") ?? 30000;
     const started = Date.now();
@@ -32619,13 +32751,13 @@ class GodotServer {
     const override = Number.parseInt(envValue("GDHARNESS_RUNTIME_TIMEOUT_MS") ?? "", 10);
     return Number.isInteger(override) && override > 0 ? override : 1e4;
   }
-  knownHoldOn(endpoint) {
+  knownHoldOn(endpoint, announced) {
     const run = this.activeProcess;
     const session = this.dapClient;
     if (run === null || !run.throughEditor || !stillRunning(run) || session === null) {
       return null;
     }
-    if (this.announcedPidOf(run) !== endpoint.pid || !session.holdIsKnown()) {
+    if (this.announcedPidOf(run, announced) !== endpoint.pid || !session.holdIsKnown()) {
       return null;
     }
     return session.whereItStopped();
@@ -32666,11 +32798,16 @@ class GodotServer {
   async handleRuntimeCommand(command, args, timeoutMs = this.runtimeTimeoutMs()) {
     const { op: _op, projectPath, pid, ...params } = asParams(args);
     const announced = runtimesAnnounced();
-    const choice = chooseRuntime(announced.running, typeof projectPath === "string" ? projectPath : this.ownProject ?? undefined, announced.unspoken, typeof pid === "number" ? pid : undefined);
+    const wanted = typeof projectPath === "string" ? projectPath : this.ownProject ?? undefined;
+    const own = typeof pid === "number" ? undefined : this.ownGameAmong(announced.running, wanted);
+    const choice = chooseRuntime(announced.running, wanted, announced.unspoken, typeof pid === "number" ? pid : own);
     if ("problem" in choice) {
       return this.createErrorResponse(choice.problem);
     }
-    const held = this.knownHoldOn(choice.endpoint);
+    const ofProject = announced.running.filter((one) => wanted === undefined || isSameDirectory(one.project.path, wanted));
+    const chosenAmongSeveral = own !== undefined && ofProject.length > 1;
+    const answeredBy = chosenAmongSeveral ? { answeredBy: own } : {};
+    const held = this.knownHoldOn(choice.endpoint, announced.running);
     if (held !== null) {
       return this.createErrorResponse(`The game (pid ${choice.endpoint.pid}) is held by the editor's debugger, ${describeHalt(held)}, and answers no runtime call while it is.`, [
         "debug_control continue lets it go, after which this call answers",
@@ -32688,7 +32825,7 @@ class GodotServer {
       }
       const { id: _id, ...payload } = reply.payload;
       if (!expectsScreenshot) {
-        return this.jsonTextResponse(payload);
+        return this.jsonTextResponse({ ...payload, ...answeredBy });
       }
       const returnedPath = readString(payload, "path");
       if (readString(payload, "type") !== "screenshot_file" || !returnedPath || !screenshotPath) {
@@ -32700,7 +32837,10 @@ class GodotServer {
       const dimensions = `${readNumber(payload, "width") ?? 0}x${readNumber(payload, "height") ?? 0} ${readString(payload, "format") ?? "unknown"}`;
       return {
         content: [
-          { type: "text", text: `Screenshot captured: ${dimensions}` },
+          {
+            type: "text",
+            text: `Screenshot captured: ${dimensions}${chosenAmongSeveral ? ` from pid ${own}, the game this server holds` : ""}`
+          },
           { type: "image", data: readFileSync13(screenshotPath).toString("base64"), mimeType: "image/png" }
         ]
       };

package/package.json

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