gdharness 1.0.19 → 1.0.20

package/build/cli.js

@@ -38110,6 +38110,9 @@ function stillRunning(run) {
   if (run?.exitCode !== null || run.endedUnwatched === true) {
     return false;
   }
+  if (typeof run.endedHere === "string") {
+    return false;
+  }
   if (!run.throughEditor && run.process === null && run.pid !== null) {
     return alive(run.pid);
   }
@@ -38122,6 +38125,9 @@ function runIsUp(run, editorSays, now = Date.now()) {
   if (run?.throughEditor !== true) {
     return stillRunning(run);
   }
+  if (typeof run.endedHere === "string") {
+    return false;
+  }
   if (run.announcedPid !== undefined && !alive(run.announcedPid)) {
     return false;
   }
@@ -38135,9 +38141,12 @@ function noCodeWillCome(run) {
 }
 function endedWithoutACode(run) {
   if (!run.throughEditor) {
-    return "This run was started by another server, the one this server replaced or one running beside it, and it ended with nothing here waiting on it, so its exit code was never collected. Everything it printed is below, read back from its transcript.";
+    return run.endedHere ? "This run was started by another server, so nothing here held it and its exit code was never collected. Everything it printed is below, read back from its transcript." : "This run was started by another server, the one this server replaced or one running beside it, and it ended with nothing here waiting on it, so its exit code was never collected. Everything it printed is below, read back from its transcript.";
   }
   const kept = "A game the editor plays is the editor's own child, so its exit code stays with the editor and none was collected here.";
+  if (run.endedHere) {
+    return `${kept} What it printed is below.`;
+  }
   if (!run.announced && run.couldAnnounce) {
     return `The editor stopped playing this run before its game announced a runtime, so the game ended while it was starting or was closed in the editor. ${kept} What it printed is below, and editor_output with op "editor" has what the editor said about it.`;
   }
@@ -40140,7 +40149,7 @@ class GodotServer {
     if (before !== null && await this.runStillGoing(before)) {
       this.logDebug("Ending the running game before starting another");
       ended = { pid: before.pid ?? this.announcedPidOf(before) ?? null };
-      await this.endActiveGame("editor_run start, which ends the run that was going before it starts another");
+      await this.endActiveGame("editor_run start, which ends the run that was going before it starts another", true);
     }
     const alreadyPlaying = new Set(discoverRuntimes().map((endpoint) => endpoint.pid));
     const wereHereFirst = this.everyRuntimeOfOurs();
@@ -40381,12 +40390,11 @@ class GodotServer {
     game.brokeOn = halt.text;
     game.log.record("error", halt.text);
   }
-  async endActiveGame(reason) {
+  async endActiveGame(reason, going) {
     const running = this.activeProcess;
-    this.activeProcess = null;
     const recorded = running?.process === null ? readRunRecord() : null;
     clearRunRecord((record) => this.couldBeOurs(record.projectPath));
-    if (!running) {
+    if (!running || !going) {
       return;
     }
     running.endedHere = reason;
@@ -40550,7 +40558,8 @@ class GodotServer {
       return;
     }
     const going = this.activeProcess;
-    if (going !== null) {
+    const givesWay = going !== null && !stillRunning(going) && typeof going.endedHere === "string";
+    if (going !== null && !givesWay) {
       if (going.throughEditor && going.consoleLost === true && (await this.editorPlayingState())?.playing) {
         try {
           await this.dap().connect();
@@ -40957,11 +40966,17 @@ class GodotServer {
     if (waitedMs !== undefined) {
       notes.push(`The wait of ${waitedMs}ms ran out and the run is still going, so this is what it had printed by then rather than everything it will print. editor_run wait again to keep waiting.`);
     }
+    if (typeof run.endedHere === "string") {
+      notes.push(`This run was ended here, by ${run.endedHere}.`);
+    } else if (!stillRunning(run) && !run.throughEditor && run.exitCode !== null) {
+      notes.push(run.exitCode === 0 ? "This run quit on its own, cleanly: exit code 0." : "Nothing here ended this run: it stopped on its own or something outside this server stopped it.");
+    }
     if (run.endedUnwatched === true) {
       notes.push(endedWithoutACode({
         throughEditor: run.throughEditor,
         announced: announced !== undefined || run.announcedPid !== undefined,
-        couldAnnounce: run.projectPath !== null && existsSync15(join23(run.projectPath, RUNTIME_AUTOLOAD2.path))
+        couldAnnounce: run.projectPath !== null && existsSync15(join23(run.projectPath, RUNTIME_AUTOLOAD2.path)),
+        endedHere: typeof run.endedHere === "string"
       }));
     }
     if (run.pickedUpPlaying === true) {
@@ -40971,11 +40986,6 @@ class GodotServer {
       const back = this.dapClient?.isConnected() === true;
       notes.push(`The debug adapter this run's console arrives over went away while the run was going, so what is below has a hole in it and the counts are of what was heard rather than of what was printed. ${back ? "It is connected again, and the line marking where is in the log." : "It is still gone, so nothing further will arrive here."} The project's own user://logs/godot.log has the rest, and "no entries" here means "not heard" rather than a quiet run.`);
     }
-    if (typeof run.endedHere === "string") {
-      notes.push(`This run was ended here, by ${run.endedHere}.`);
-    } else if (!stillRunning(run) && !run.throughEditor && run.exitCode !== null) {
-      notes.push(run.exitCode === 0 ? "This run quit on its own, cleanly: exit code 0." : "Nothing here ended this run: it stopped on its own or something outside this server stopped it.");
-    }
     if (run.transcript !== null && selected.omitted > 0) {
       notes.push(`Everything this run has printed is in ${run.transcript}, uncapped and still being written. Read it for output, not for whether the run is alive: a transcript that stops growing is a run between prints. running above is asked of the operating system while there is a process to ask about, and for an editor-played run that announced no runtime it is the editor's answer instead, which can lag after the game has gone.`);
     }
@@ -41014,7 +41024,7 @@ class GodotServer {
     const endedPid = stopped.pid ?? announcedPid;
     const children = readBoolean(args, "andChildren") === true && wasRunning ? await this.whatTheRunStarted(stopped) : null;
     this.logDebug("Stopping the running game");
-    await this.endActiveGame("editor_run stop");
+    await this.endActiveGame("editor_run stop", wasRunning);
     const ended = children === null ? null : endChildrenAmong(children);
     if (wasRunning) {
       for (const pid of new Set([endedPid, announcedPid])) {
@@ -41033,12 +41043,12 @@ class GodotServer {
         childrenLeft: ended.left.length === 0 ? undefined : ended.left,
         childrenUnknown: ended.unknown === false ? undefined : true
       },
-      exitedBeforeStop: stopped.exitCode !== null || !wasRunning,
+      exitedBeforeStop: !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." : "The process named under endedPid was ended."} ${aboutTheChildren(ended, stopped.throughEditor)}`,
+      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 ? endedPid === null ? "The editor was asked to stop the scene it is playing. Its game had not announced a runtime, so no process was named under endedPid, and its exit code stays with the editor." : "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)
     });
   }

package/build/index.js

@@ -30797,6 +30797,9 @@ function stillRunning(run) {
   if (run?.exitCode !== null || run.endedUnwatched === true) {
     return false;
   }
+  if (typeof run.endedHere === "string") {
+    return false;
+  }
   if (!run.throughEditor && run.process === null && run.pid !== null) {
     return alive(run.pid);
   }
@@ -30810,6 +30813,9 @@ function runIsUp(run, editorSays, now = Date.now()) {
   if (run?.throughEditor !== true) {
     return stillRunning(run);
   }
+  if (typeof run.endedHere === "string") {
+    return false;
+  }
   if (run.announcedPid !== undefined && !alive(run.announcedPid)) {
     return false;
   }
@@ -30823,9 +30829,12 @@ function noCodeWillCome(run) {
 }
 function endedWithoutACode(run) {
   if (!run.throughEditor) {
-    return "This run was started by another server, the one this server replaced or one running beside it, and it ended with nothing here waiting on it, so its exit code was never collected. Everything it printed is below, read back from its transcript.";
+    return run.endedHere ? "This run was started by another server, so nothing here held it and its exit code was never collected. Everything it printed is below, read back from its transcript." : "This run was started by another server, the one this server replaced or one running beside it, and it ended with nothing here waiting on it, so its exit code was never collected. Everything it printed is below, read back from its transcript.";
   }
   const kept = "A game the editor plays is the editor's own child, so its exit code stays with the editor and none was collected here.";
+  if (run.endedHere) {
+    return `${kept} What it printed is below.`;
+  }
   if (!run.announced && run.couldAnnounce) {
     return `The editor stopped playing this run before its game announced a runtime, so the game ended while it was starting or was closed in the editor. ${kept} What it printed is below, and editor_output with op "editor" has what the editor said about it.`;
   }
@@ -32873,7 +32882,7 @@ class GodotServer {
     if (before !== null && await this.runStillGoing(before)) {
       this.logDebug("Ending the running game before starting another");
       ended = { pid: before.pid ?? this.announcedPidOf(before) ?? null };
-      await this.endActiveGame("editor_run start, which ends the run that was going before it starts another");
+      await this.endActiveGame("editor_run start, which ends the run that was going before it starts another", true);
     }
     const alreadyPlaying = new Set(discoverRuntimes().map((endpoint) => endpoint.pid));
     const wereHereFirst = this.everyRuntimeOfOurs();
@@ -33114,12 +33123,11 @@ class GodotServer {
     game.brokeOn = halt.text;
     game.log.record("error", halt.text);
   }
-  async endActiveGame(reason) {
+  async endActiveGame(reason, going) {
     const running = this.activeProcess;
-    this.activeProcess = null;
     const recorded = running?.process === null ? readRunRecord() : null;
     clearRunRecord((record) => this.couldBeOurs(record.projectPath));
-    if (!running) {
+    if (!running || !going) {
       return;
     }
     running.endedHere = reason;
@@ -33283,7 +33291,8 @@ class GodotServer {
       return;
     }
     const going = this.activeProcess;
-    if (going !== null) {
+    const givesWay = going !== null && !stillRunning(going) && typeof going.endedHere === "string";
+    if (going !== null && !givesWay) {
       if (going.throughEditor && going.consoleLost === true && (await this.editorPlayingState())?.playing) {
         try {
           await this.dap().connect();
@@ -33690,11 +33699,17 @@ class GodotServer {
     if (waitedMs !== undefined) {
       notes.push(`The wait of ${waitedMs}ms ran out and the run is still going, so this is what it had printed by then rather than everything it will print. editor_run wait again to keep waiting.`);
     }
+    if (typeof run.endedHere === "string") {
+      notes.push(`This run was ended here, by ${run.endedHere}.`);
+    } else if (!stillRunning(run) && !run.throughEditor && run.exitCode !== null) {
+      notes.push(run.exitCode === 0 ? "This run quit on its own, cleanly: exit code 0." : "Nothing here ended this run: it stopped on its own or something outside this server stopped it.");
+    }
     if (run.endedUnwatched === true) {
       notes.push(endedWithoutACode({
         throughEditor: run.throughEditor,
         announced: announced !== undefined || run.announcedPid !== undefined,
-        couldAnnounce: run.projectPath !== null && existsSync10(join16(run.projectPath, RUNTIME_AUTOLOAD.path))
+        couldAnnounce: run.projectPath !== null && existsSync10(join16(run.projectPath, RUNTIME_AUTOLOAD.path)),
+        endedHere: typeof run.endedHere === "string"
       }));
     }
     if (run.pickedUpPlaying === true) {
@@ -33704,11 +33719,6 @@ class GodotServer {
       const back = this.dapClient?.isConnected() === true;
       notes.push(`The debug adapter this run's console arrives over went away while the run was going, so what is below has a hole in it and the counts are of what was heard rather than of what was printed. ${back ? "It is connected again, and the line marking where is in the log." : "It is still gone, so nothing further will arrive here."} The project's own user://logs/godot.log has the rest, and "no entries" here means "not heard" rather than a quiet run.`);
     }
-    if (typeof run.endedHere === "string") {
-      notes.push(`This run was ended here, by ${run.endedHere}.`);
-    } else if (!stillRunning(run) && !run.throughEditor && run.exitCode !== null) {
-      notes.push(run.exitCode === 0 ? "This run quit on its own, cleanly: exit code 0." : "Nothing here ended this run: it stopped on its own or something outside this server stopped it.");
-    }
     if (run.transcript !== null && selected.omitted > 0) {
       notes.push(`Everything this run has printed is in ${run.transcript}, uncapped and still being written. Read it for output, not for whether the run is alive: a transcript that stops growing is a run between prints. running above is asked of the operating system while there is a process to ask about, and for an editor-played run that announced no runtime it is the editor's answer instead, which can lag after the game has gone.`);
     }
@@ -33747,7 +33757,7 @@ class GodotServer {
     const endedPid = stopped.pid ?? announcedPid;
     const children = readBoolean(args, "andChildren") === true && wasRunning ? await this.whatTheRunStarted(stopped) : null;
     this.logDebug("Stopping the running game");
-    await this.endActiveGame("editor_run stop");
+    await this.endActiveGame("editor_run stop", wasRunning);
     const ended = children === null ? null : endChildrenAmong(children);
     if (wasRunning) {
       for (const pid of new Set([endedPid, announcedPid])) {
@@ -33766,12 +33776,12 @@ class GodotServer {
         childrenLeft: ended.left.length === 0 ? undefined : ended.left,
         childrenUnknown: ended.unknown === false ? undefined : true
       },
-      exitedBeforeStop: stopped.exitCode !== null || !wasRunning,
+      exitedBeforeStop: !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." : "The process named under endedPid was ended."} ${aboutTheChildren(ended, stopped.throughEditor)}`,
+      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 ? endedPid === null ? "The editor was asked to stop the scene it is playing. Its game had not announced a runtime, so no process was named under endedPid, and its exit code stays with the editor." : "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)
     });
   }

package/package.json

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