gdharness 0.13.40 → 0.13.41

package/build/cli.js

@@ -16061,7 +16061,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: []
     },
@@ -36447,7 +36447,7 @@ 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 run5, ASK_TIMEOUT_MS = 6000;
 var init_process_time = __esm(() => {
   run5 = promisify5(execFile5);
 });
@@ -36676,7 +36676,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 +36761,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;
     }
@@ -37425,6 +37436,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);
@@ -38862,7 +38883,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 +38892,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 +39188,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 +39494,39 @@ 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;
   }
+  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 +39670,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) {
@@ -39870,13 +39917,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();
@@ -39921,7 +39968,7 @@ class GodotServer {
     if ("problem" in choice) {
       return this.createErrorResponse(choice.problem);
     }
-    const held = this.knownHoldOn(choice.endpoint);
+    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",

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

@@ -27713,7 +27713,7 @@ async function handleLSPTool(client, toolName, args) {
 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 = 6000;
 async function cpuSecondsOf(pid) {
   try {
     return process.platform === "win32" ? await askWindows(pid) : await askPosix(pid);
@@ -28270,7 +28270,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 +28360,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;
     }
@@ -29505,7 +29516,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: []
   },
@@ -30174,6 +30185,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);
@@ -31611,7 +31632,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 +31641,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 +31937,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 +32243,39 @@ 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;
   }
+  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 +32419,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) {
@@ -32619,13 +32666,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();
@@ -32670,7 +32717,7 @@ class GodotServer {
     if ("problem" in choice) {
       return this.createErrorResponse(choice.problem);
     }
-    const held = this.knownHoldOn(choice.endpoint);
+    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",

package/package.json

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