gdharness 1.0.29 → 1.0.30

package/build/cli.js

@@ -37730,6 +37730,49 @@ var init_lsp_client = __esm(() => {
   init_ports();
 });
 
+// src/outside.ts
+import { spawn } from "node:child_process";
+import { fileURLToPath as fileURLToPath5 } from "node:url";
+function encodeSpec(spec) {
+  return Buffer.from(JSON.stringify(spec), "utf8").toString("base64url");
+}
+function readLaunched(printed) {
+  const line = printed.split(`
+`).find((one) => one.trim() !== "")?.trim() ?? "";
+  const pid = /^pid (\d+)$/.exec(line);
+  if (pid?.[1] !== undefined) {
+    return { pid: Number(pid[1]) };
+  }
+  return { error: line.replace(/^error /, "") || "the launcher said nothing" };
+}
+async function launchOutsideTheTree(spec, runtime = process.execPath, keeper = KEEPER_SCRIPT) {
+  return await new Promise((resolve) => {
+    const launcher = spawn(runtime, [keeper, "launch", encodeSpec(spec)], {
+      stdio: ["ignore", "pipe", "pipe"],
+      windowsHide: true
+    });
+    let printed = "";
+    let complained = "";
+    launcher.stdout.on("data", (chunk) => {
+      printed += chunk.toString();
+    });
+    launcher.stderr.on("data", (chunk) => {
+      complained += chunk.toString();
+    });
+    launcher.once("error", (error) => {
+      resolve({ error: `the launcher did not start: ${error.message}` });
+    });
+    launcher.once("close", () => {
+      const launched = readLaunched(printed);
+      resolve("error" in launched && complained.trim() !== "" ? { error: `${launched.error}: ${complained.trim()}` } : launched);
+    });
+  });
+}
+var KEEPER_SCRIPT;
+var init_outside = __esm(() => {
+  KEEPER_SCRIPT = fileURLToPath5(new URL("./keeper.js", import.meta.url));
+});
+
 // src/process-time.ts
 import { execFile as execFile6 } from "node:child_process";
 import { promisify as promisify6 } from "node:util";
@@ -37949,9 +37992,6 @@ import { basename as basename3, join as join22 } from "node:path";
 function runsDirectory() {
   return join22(runtimeDirectory(), "runs");
 }
-function recordPath() {
-  return join22(runsDirectory(), "run.json");
-}
 function recordPaths() {
   return runtimeDirectories().map((directory) => join22(directory, "runs", "run.json"));
 }
@@ -37960,10 +38000,6 @@ function openTranscript(startedAt) {
   const path = join22(runsDirectory(), `run-${startedAt}.log`);
   return { path, fd: openSync2(path, "a") };
 }
-function writeRunRecord(record) {
-  mkdirSync13(runsDirectory(), { recursive: true });
-  writeFileSync15(recordPath(), JSON.stringify(record, null, 2), "utf8");
-}
 function editorNotePath() {
   return join22(runsDirectory(), "editor-run.json");
 }
@@ -37999,21 +38035,6 @@ function editorNoteAt(path) {
   }
   return { projectPath, transcript, startedAt };
 }
-function recordRunEnded(pid, ending) {
-  const path = recordPath();
-  const record = recordAt(path);
-  if (record === null || record.pid !== pid) {
-    return;
-  }
-  const written = {
-    ...record,
-    ...ending.exitCode === null ? {} : { exitCode: ending.exitCode },
-    ...ending.exitSignal === null ? {} : { exitSignal: ending.exitSignal }
-  };
-  try {
-    writeFileSync15(path, JSON.stringify(written, null, 2), "utf8");
-  } catch {}
-}
 function readRunRecord() {
   for (const path of recordPaths()) {
     const record = recordAt(path);
@@ -38240,7 +38261,7 @@ var init_run_record = __esm(() => {
 });
 
 // src/server.ts
-import { execFile as execFile7, spawn } from "node:child_process";
+import { execFile as execFile7, spawn as spawn2 } from "node:child_process";
 import { randomUUID as randomUUID2 } from "node:crypto";
 import {
   appendFileSync,
@@ -38261,7 +38282,7 @@ import {
 import { tmpdir as tmpdir5 } from "node:os";
 import { basename as basename4, dirname as dirname16, extname as extname2, isAbsolute as isAbsolute3, join as join23, normalize as normalize3, relative as relative3 } from "node:path";
 import { setTimeout as delay3 } from "node:timers/promises";
-import { fileURLToPath as fileURLToPath5 } from "node:url";
+import { fileURLToPath as fileURLToPath6 } from "node:url";
 import { promisify as promisify7 } from "node:util";
 function captureDestinationRefusal(outputPath, projects) {
   if (/^(res|user):\/\//.test(outputPath)) {
@@ -38330,7 +38351,7 @@ function stillRunning(run) {
   if (typeof run.endedHere === "string") {
     return false;
   }
-  if (!run.throughEditor && run.process === null && run.pid !== null) {
+  if (!run.throughEditor && run.pid !== null) {
     return alive(run.pid);
   }
   if (run.announcedPid !== undefined && !alive(run.announcedPid)) {
@@ -38354,10 +38375,10 @@ function runIsUp(run, editorSays, now = Date.now()) {
   return editorSays ?? stillRunning(run);
 }
 function noCodeWillCome(run) {
-  return !exited(run) && run.process === null;
+  return !exited(run);
 }
-async function untilGone(handle, pids, withinMs = STOP_WAIT_MS) {
-  const gone = () => (handle?.exitCode !== null || handle.signalCode !== null) && pids.every((pid) => !alive(pid));
+async function untilGone(pids, withinMs = STOP_WAIT_MS) {
+  const gone = () => pids.every((pid) => !alive(pid));
   const deadline = Date.now() + withinMs;
   while (!gone() && Date.now() < deadline) {
     await delay3(50);
@@ -38365,6 +38386,9 @@ async function untilGone(handle, pids, withinMs = STOP_WAIT_MS) {
   return gone();
 }
 function endedWithoutACode(run) {
+  if (!run.throughEditor && !run.pickedUp) {
+    return "This run was started here, and the keeper holding it wrote no exit code into its note: the keeper was ended before the game, or another run replaced the note. Everything it printed is below, read back from its transcript.";
+  }
   if (!run.throughEditor) {
     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.";
   }
@@ -40116,7 +40140,12 @@ class GodotServer {
     return anEditorIsStillComing(listeningSince, this.launchedEditorIsUp());
   }
   launchedEditorIsUp() {
-    return this.launchedEditor?.exitCode === null && this.launchedEditor.signalCode === null;
+    const launched = this.launchedEditor;
+    if (launched === null || !alive(launched.pid)) {
+      return false;
+    }
+    const now = startTimesOf([launched.pid]).get(launched.pid);
+    return launched.startedAt === null || now === undefined || now === launched.startedAt;
   }
   dap() {
     const port = this.editorServes("dapPort", "GDHARNESS_DAP_PORT", DEFAULT_DAP_PORT);
@@ -40477,9 +40506,9 @@ class GodotServer {
   }
   async openAnEditor(engine, projectPath, ports) {
     clearEditorLog(projectPath);
-    const editor = spawn(engine, editorArguments(projectPath, ports, editorLogPath(projectPath)), {
-      stdio: "ignore",
-      detached: true,
+    const launched = await launchOutsideTheTree({
+      command: engine,
+      args: editorArguments(projectPath, ports, editorLogPath(projectPath)),
       env: {
         ...process.env,
         GDHARNESS_RUNTIME_DIR: runtimeDirectory(),
@@ -40488,23 +40517,15 @@ class GodotServer {
         [OPENED_BY_A_SERVER]: "1"
       }
     });
-    if (editor.pid !== undefined) {
-      writeEditorLogNote(projectPath, editor.pid);
+    if ("error" in launched) {
+      return { pid: null, error: launched.error };
     }
-    const started = await new Promise((resolve) => {
-      editor.once("spawn", () => {
-        resolve(null);
-      });
-      editor.once("error", (error) => {
-        resolve(error.message);
-      });
-    });
-    if (started !== null) {
-      return { pid: null, error: started };
-    }
-    editor.unref();
-    this.launchedEditor = editor.pid === undefined ? null : editor;
-    return { pid: editor.pid ?? null, error: null };
+    writeEditorLogNote(projectPath, launched.pid);
+    this.launchedEditor = {
+      pid: launched.pid,
+      startedAt: startTimesOf([launched.pid]).get(launched.pid) ?? null
+    };
+    return { pid: launched.pid, error: null };
   }
   async portsForAnEditor() {
     const lsp = portFromEnvOrNull("GDHARNESS_LSP_PORT") ?? await freePort(DEFAULT_LSP_PORT);
@@ -40574,7 +40595,12 @@ class GodotServer {
       userArgs: given.value
     });
     this.logDebug(`Running Godot project: ${engine.value} ${cmdArgs.join(" ")}`);
-    const started = this.spawnKeptGame(engine.value, cmdArgs, project.value.path, needsItsOwnProcess(asked.value) ? environmentFor({ ...asked.value, runtimeDirectory: runtimeDirectory() }) : undefined);
+    const started = await this.launchKeptGame(engine.value, cmdArgs, project.value.path, needsItsOwnProcess(asked.value) ? environmentFor({ ...asked.value, runtimeDirectory: runtimeDirectory() }) : undefined);
+    if ("error" in started) {
+      return this.createErrorResponse(`The game could not be started: ${started.error}`, [
+        "editor_status says which Godot this server runs and whether it answers"
+      ]);
+    }
     started.announcedBefore = alreadyPlaying;
     this.activeProcess = started;
     const spawnedInstead = this.godotBridge.isConnected() && editorWouldPlay && given.value.length > 0 ? " The editor cannot be handed arguments for a game it plays, so this one was started " + "here: the debug_* tools answer only for a game the editor is playing." : this.godotBridge.isConnected() && editorWouldPlay && needsItsOwnProcess(asked.value) ? " The editor plays a game with its own environment, so a run given one was started " + "here: the debug_* tools answer only for a game the editor is playing." : "";
@@ -40586,7 +40612,7 @@ class GodotServer {
       started: true,
       through: "gdharness",
       alsoRunning: stranded.length === 0 ? undefined : stranded.map((one) => one.pid),
-      pid: started.process.pid ?? null,
+      pid: started.pid,
       arguments: cmdArgs,
       transcript: started.transcript,
       refreshedClasses: refreshed.value,
@@ -40701,7 +40727,6 @@ class GodotServer {
     closeSync2(transcript.fd);
     const playAnswer = asParams(JSON.parse(answer.content[0]?.text ?? "{}"));
     const played = {
-      process: null,
       pid: null,
       log,
       transcript: transcript.path,
@@ -40800,8 +40825,14 @@ class GodotServer {
   }
   async endActiveGame(reason, going) {
     const running = this.activeProcess;
-    const recorded = running?.process === null ? readRunRecord() : null;
-    clearRunRecord((record) => this.couldBeOurs(record.projectPath));
+    const recorded = running !== null && !running.throughEditor ? readRunRecord() : null;
+    const clearTheRecord = () => {
+      clearRunRecord((record) => this.couldBeOurs(record.projectPath));
+    };
+    const aKeeperHoldsIt = running !== null && going && !running.throughEditor && running.pid !== null;
+    if (!aKeeperHoldsIt) {
+      clearTheRecord();
+    }
     if (!running || !going) {
       return true;
     }
@@ -40809,16 +40840,13 @@ class GodotServer {
     const announced = this.announcedPidOf(running);
     if (running.throughEditor) {
       await this.handleViaBridge("stop_playing", {});
-      return await untilGone(null, announced === undefined ? [] : [announced]);
-    }
-    if (running.process !== null) {
-      running.process.kill();
-      return await untilGone(running.process, announced === undefined ? [] : [announced]);
+      return await untilGone(announced === undefined ? [] : [announced]);
     }
     if (running.pid === null) {
       return true;
     }
     if (recorded === null || recorded.pid !== running.pid || !stillTheRecordedRun(recorded)) {
+      clearTheRecord();
       running.endedHere = null;
       running.log.record("warning", `This run was not ended here: pid ${running.pid} no longer answers as the run that was recorded, so nothing was signalled. If that process is still the game, end it yourself; if it is not, it belongs to something else.`);
       return true;
@@ -40831,12 +40859,20 @@ class GodotServer {
     } catch {
       landed = false;
     }
-    const gone = await untilGone(null, [running.pid]);
+    const gone = await untilGone([running.pid]);
+    if (gone) {
+      await this.untilTheExitIsRecorded(running);
+    }
+    if (landed && gone) {
+      running.exitCode = null;
+      running.exitSignal = "SIGTERM";
+    }
+    clearTheRecord();
     running.log.record("info", landed ? `gdharness ended pid ${running.pid}, which the operating system described as ${described}.` : `gdharness signalled pid ${running.pid} and it was already gone; the operating system had described it as ${described}.`);
     return gone;
   }
   spawnGame(godotPath, cmdArgs, env) {
-    const child = spawn(godotPath, cmdArgs, { stdio: ["ignore", "pipe", "pipe"], ...env ? { env } : {} });
+    const child = spawn2(godotPath, cmdArgs, { stdio: ["ignore", "pipe", "pipe"], ...env ? { env } : {} });
     const cancelled = callSignal();
     if (cancelled !== undefined) {
       const end = () => {
@@ -40888,25 +40924,23 @@ class GodotServer {
     });
     return started;
   }
-  spawnKeptGame(godotPath, cmdArgs, projectPath, env) {
+  async launchKeptGame(godotPath, cmdArgs, projectPath, env) {
     const startedAt = Date.now();
     const transcript = openTranscript(startedAt);
-    let child;
-    try {
-      child = spawn(godotPath, cmdArgs, {
-        stdio: ["ignore", transcript.fd, transcript.fd],
-        detached: true,
-        ...env ? { env } : {}
-      });
-    } finally {
-      closeSync2(transcript.fd);
+    closeSync2(transcript.fd);
+    const launched = await launchOutsideTheTree({
+      command: godotPath,
+      args: cmdArgs,
+      ...env === undefined ? {} : { env },
+      run: { transcript: transcript.path, startedAt, projectPath }
+    });
+    if ("error" in launched) {
+      return launched;
     }
-    child.unref();
-    const log = new GameLog;
-    const started = {
-      process: child,
-      pid: child.pid ?? null,
-      log,
+    sweepTranscripts();
+    return {
+      pid: launched.pid,
+      log: new GameLog,
       transcript: transcript.path,
       readOffset: 0,
       projectPath,
@@ -40916,34 +40950,6 @@ class GodotServer {
       throughEditor: false,
       brokeOn: null
     };
-    child.on("exit", (code, signal) => {
-      this.logDebug(`Godot process exited with code ${code ?? "none"}, signal ${signal ?? "none"}`);
-      this.drainTranscript(started);
-      log.finish();
-      started.exitCode = code;
-      started.exitSignal = code === null ? signal : null;
-      if (started.pid !== null) {
-        recordRunEnded(started.pid, { exitCode: started.exitCode, exitSignal: started.exitSignal });
-      }
-    });
-    child.on("error", (err) => {
-      console.error("Failed to start Godot process:", err);
-      log.append("stderr", `${err.message}
-`);
-      started.exitCode = -1;
-    });
-    if (started.pid !== null) {
-      writeRunRecord({
-        pid: started.pid,
-        transcript: transcript.path,
-        startedAt,
-        projectPath,
-        arguments: cmdArgs,
-        command: godotPath
-      });
-    }
-    sweepTranscripts();
-    return started;
   }
   drainTranscript(game) {
     if (game.transcript === null) {
@@ -40999,7 +41005,6 @@ class GodotServer {
     const left = readEditorRunNote();
     const note = left !== null && project !== null && isSameDirectory(left.projectPath, project) ? left : null;
     const picked = {
-      process: null,
       pid: null,
       log: new GameLog,
       transcript: note?.transcript ?? null,
@@ -41136,7 +41141,6 @@ class GodotServer {
       return null;
     }
     const adopted = {
-      process: null,
       pid: record.pid,
       log: new GameLog,
       transcript: record.transcript,
@@ -41146,7 +41150,8 @@ class GodotServer {
       exitCode: null,
       exitSignal: null,
       throughEditor: false,
-      brokeOn: null
+      brokeOn: null,
+      pickedUp: true
     };
     this.drainTranscript(adopted);
     if (!alive(record.pid) || !couldStillBeTheRecordedRun(record)) {
@@ -41281,8 +41286,8 @@ class GodotServer {
   async runStillGoing(run, editorSays) {
     if (!run.throughEditor) {
       const going = stillRunning(run);
-      if (!going && run.process !== null && !exited(run)) {
-        await untilGone(run.process, [], EXIT_REPORTED_WITHIN_MS);
+      if (!going && run.pid !== null && !exited(run) && run.endedUnwatched !== true && typeof run.endedHere !== "string" && !await this.untilTheExitIsRecorded(run)) {
+        run.endedUnwatched = true;
       }
       return going;
     }
@@ -41299,6 +41304,21 @@ class GodotServer {
     }
     return runIsUp(run, said);
   }
+  async untilTheExitIsRecorded(run) {
+    const until = Date.now() + EXIT_REPORTED_WITHIN_MS;
+    for (;; ) {
+      const record = readRunRecord();
+      if (record !== null && record.pid === run.pid && (record.exitCode !== undefined || record.exitSignal !== undefined)) {
+        run.exitCode = record.exitCode ?? null;
+        run.exitSignal = record.exitSignal ?? null;
+        return true;
+      }
+      if (Date.now() >= until) {
+        return false;
+      }
+      await delay3(50);
+    }
+  }
   handleEditorConsole(args) {
     const status = this.godotBridge.getStatus();
     const projectPath = status.projectPath ?? this.ownProject ?? undefined;
@@ -41400,7 +41420,8 @@ class GodotServer {
         throughEditor: run.throughEditor,
         announced: announced !== undefined || run.announcedPid !== undefined,
         couldAnnounce: run.projectPath !== null && existsSync15(join23(run.projectPath, RUNTIME_AUTOLOAD2.path)),
-        endedHere: typeof run.endedHere === "string"
+        endedHere: typeof run.endedHere === "string",
+        pickedUp: run.pickedUp === true
       }));
     }
     if (run.pickedUpPlaying === true) {
@@ -41426,7 +41447,7 @@ class GodotServer {
       ...hold,
       endedUnwatched: run.endedUnwatched === true ? true : undefined,
       endedBy: stillRunning(run) ? undefined : run.endedHere ?? null,
-      project: !run.throughEditor && run.process === null ? run.projectPath ?? undefined : undefined,
+      project: run.throughEditor ? undefined : run.projectPath ?? undefined,
       transcript: run.transcript ?? undefined,
       startedAt: new Date(run.startedAt).toISOString(),
       elapsedMs: Date.now() - run.startedAt,
@@ -42056,6 +42077,7 @@ var init_server3 = __esm(() => {
   init_issues();
   init_junit();
   init_lsp_client();
+  init_outside();
   init_paths();
   init_ports();
   init_process_children();
@@ -42071,7 +42093,7 @@ var init_server3 = __esm(() => {
   init_tool_definitions();
   init_update_check();
   run7 = promisify7(execFile7);
-  __dirname2 = dirname16(fileURLToPath5(import.meta.url));
+  __dirname2 = dirname16(fileURLToPath6(import.meta.url));
   CONSOLE_WRAPPER = /_console(\.exe)?$/i;
   LONGEST_BOOT_NOTED_MS = 5 * 60000;
   VALUE_NAMES = {

package/build/index.js

@@ -10183,7 +10183,7 @@ function defectReport(where, error, context = {}) {
 }
 
 // src/server.ts
-import { execFile as execFile5, spawn } from "node:child_process";
+import { execFile as execFile5, spawn as spawn2 } from "node:child_process";
 import { randomUUID as randomUUID2 } from "node:crypto";
 import {
   appendFileSync,
@@ -10204,7 +10204,7 @@ import {
 import { tmpdir as tmpdir4 } from "node:os";
 import { basename as basename3, dirname as dirname10, extname as extname2, isAbsolute as isAbsolute3, join as join16, normalize as normalize2, relative as relative3 } from "node:path";
 import { setTimeout as delay3 } from "node:timers/promises";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { promisify as promisify5 } from "node:util";
 
 // node_modules/zod/v3/helpers/util.js
@@ -28884,6 +28884,46 @@ async function handleLSPTool(client, toolName, args) {
   }
 }
 
+// src/outside.ts
+import { spawn } from "node:child_process";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+var KEEPER_SCRIPT = fileURLToPath2(new URL("./keeper.js", import.meta.url));
+function encodeSpec(spec) {
+  return Buffer.from(JSON.stringify(spec), "utf8").toString("base64url");
+}
+function readLaunched(printed) {
+  const line = printed.split(`
+`).find((one) => one.trim() !== "")?.trim() ?? "";
+  const pid = /^pid (\d+)$/.exec(line);
+  if (pid?.[1] !== undefined) {
+    return { pid: Number(pid[1]) };
+  }
+  return { error: line.replace(/^error /, "") || "the launcher said nothing" };
+}
+async function launchOutsideTheTree(spec, runtime = process.execPath, keeper = KEEPER_SCRIPT) {
+  return await new Promise((resolve) => {
+    const launcher = spawn(runtime, [keeper, "launch", encodeSpec(spec)], {
+      stdio: ["ignore", "pipe", "pipe"],
+      windowsHide: true
+    });
+    let printed = "";
+    let complained = "";
+    launcher.stdout.on("data", (chunk) => {
+      printed += chunk.toString();
+    });
+    launcher.stderr.on("data", (chunk) => {
+      complained += chunk.toString();
+    });
+    launcher.once("error", (error) => {
+      resolve({ error: `the launcher did not start: ${error.message}` });
+    });
+    launcher.once("close", () => {
+      const launched = readLaunched(printed);
+      resolve("error" in launched && complained.trim() !== "" ? { error: `${launched.error}: ${complained.trim()}` } : launched);
+    });
+  });
+}
+
 // src/process-time.ts
 import { execFile as execFile4 } from "node:child_process";
 import { promisify as promisify4 } from "node:util";
@@ -29336,9 +29376,6 @@ import { basename as basename2, join as join14 } from "node:path";
 function runsDirectory() {
   return join14(runtimeDirectory(), "runs");
 }
-function recordPath() {
-  return join14(runsDirectory(), "run.json");
-}
 function recordPaths() {
   return runtimeDirectories().map((directory) => join14(directory, "runs", "run.json"));
 }
@@ -29347,10 +29384,6 @@ function openTranscript(startedAt) {
   const path = join14(runsDirectory(), `run-${startedAt}.log`);
   return { path, fd: openSync2(path, "a") };
 }
-function writeRunRecord(record) {
-  mkdirSync8(runsDirectory(), { recursive: true });
-  writeFileSync9(recordPath(), JSON.stringify(record, null, 2), "utf8");
-}
 function editorNotePath() {
   return join14(runsDirectory(), "editor-run.json");
 }
@@ -29386,21 +29419,6 @@ function editorNoteAt(path) {
   }
   return { projectPath, transcript, startedAt };
 }
-function recordRunEnded(pid, ending) {
-  const path = recordPath();
-  const record = recordAt(path);
-  if (record === null || record.pid !== pid) {
-    return;
-  }
-  const written = {
-    ...record,
-    ...ending.exitCode === null ? {} : { exitCode: ending.exitCode },
-    ...ending.exitSignal === null ? {} : { exitSignal: ending.exitSignal }
-  };
-  try {
-    writeFileSync9(path, JSON.stringify(written, null, 2), "utf8");
-  } catch {}
-}
 function readRunRecord() {
   for (const path of recordPaths()) {
     const record = recordAt(path);
@@ -29635,7 +29653,7 @@ import {
   writeFileSync as writeFileSync10
 } from "node:fs";
 import { dirname as dirname9, join as join15 } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 var ADDONS = ["gdharness_editor", "gdharness_runtime", "auto_reload"];
 var EDITOR_PLUGINS = ["gdharness_editor", "auto_reload"];
 var RUNTIME_AUTOLOAD = {
@@ -29681,7 +29699,7 @@ function shippedEditorDigest() {
   return shippedDigest ?? undefined;
 }
 function shippedAddonsDirectory() {
-  return join15(dirname9(fileURLToPath2(import.meta.url)), "godot", "addons");
+  return join15(dirname9(fileURLToPath3(import.meta.url)), "godot", "addons");
 }
 function installedAddonVersion(projectPath) {
   const marker = join15(projectPath, "addons", ADDONS[0], VERSION_MARKER);
@@ -30948,7 +30966,7 @@ function buildToolDefinitions() {
 var UPDATE_NOTICE_EVERY = 500;
 var FEEDBACK_NOTICE_EVERY = 250;
 var run5 = promisify5(execFile5);
-var __dirname2 = dirname10(fileURLToPath3(import.meta.url));
+var __dirname2 = dirname10(fileURLToPath4(import.meta.url));
 var EDITOR_RESTART_TIMEOUT_MS = 90000;
 var HOLD_PING_MS = 2000;
 var SLOWEST_FRAME_RATE = 20;
@@ -31019,7 +31037,7 @@ function stillRunning(run) {
   if (typeof run.endedHere === "string") {
     return false;
   }
-  if (!run.throughEditor && run.process === null && run.pid !== null) {
+  if (!run.throughEditor && run.pid !== null) {
     return alive(run.pid);
   }
   if (run.announcedPid !== undefined && !alive(run.announcedPid)) {
@@ -31044,12 +31062,12 @@ function runIsUp(run, editorSays, now = Date.now()) {
   return editorSays ?? stillRunning(run);
 }
 function noCodeWillCome(run) {
-  return !exited(run) && run.process === null;
+  return !exited(run);
 }
 var STOP_WAIT_MS = 1e4;
 var EXIT_REPORTED_WITHIN_MS = 2000;
-async function untilGone(handle, pids, withinMs = STOP_WAIT_MS) {
-  const gone = () => (handle?.exitCode !== null || handle.signalCode !== null) && pids.every((pid) => !alive(pid));
+async function untilGone(pids, withinMs = STOP_WAIT_MS) {
+  const gone = () => pids.every((pid) => !alive(pid));
   const deadline = Date.now() + withinMs;
   while (!gone() && Date.now() < deadline) {
     await delay3(50);
@@ -31057,6 +31075,9 @@ async function untilGone(handle, pids, withinMs = STOP_WAIT_MS) {
   return gone();
 }
 function endedWithoutACode(run) {
+  if (!run.throughEditor && !run.pickedUp) {
+    return "This run was started here, and the keeper holding it wrote no exit code into its note: the keeper was ended before the game, or another run replaced the note. Everything it printed is below, read back from its transcript.";
+  }
   if (!run.throughEditor) {
     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.";
   }
@@ -32856,7 +32877,12 @@ class GodotServer {
     return anEditorIsStillComing(listeningSince, this.launchedEditorIsUp());
   }
   launchedEditorIsUp() {
-    return this.launchedEditor?.exitCode === null && this.launchedEditor.signalCode === null;
+    const launched = this.launchedEditor;
+    if (launched === null || !alive(launched.pid)) {
+      return false;
+    }
+    const now = startTimesOf([launched.pid]).get(launched.pid);
+    return launched.startedAt === null || now === undefined || now === launched.startedAt;
   }
   dap() {
     const port = this.editorServes("dapPort", "GDHARNESS_DAP_PORT", DEFAULT_DAP_PORT);
@@ -33217,9 +33243,9 @@ class GodotServer {
   }
   async openAnEditor(engine, projectPath, ports) {
     clearEditorLog(projectPath);
-    const editor = spawn(engine, editorArguments(projectPath, ports, editorLogPath(projectPath)), {
-      stdio: "ignore",
-      detached: true,
+    const launched = await launchOutsideTheTree({
+      command: engine,
+      args: editorArguments(projectPath, ports, editorLogPath(projectPath)),
       env: {
         ...process.env,
         GDHARNESS_RUNTIME_DIR: runtimeDirectory(),
@@ -33228,23 +33254,15 @@ class GodotServer {
         [OPENED_BY_A_SERVER]: "1"
       }
     });
-    if (editor.pid !== undefined) {
-      writeEditorLogNote(projectPath, editor.pid);
-    }
-    const started = await new Promise((resolve) => {
-      editor.once("spawn", () => {
-        resolve(null);
-      });
-      editor.once("error", (error) => {
-        resolve(error.message);
-      });
-    });
-    if (started !== null) {
-      return { pid: null, error: started };
+    if ("error" in launched) {
+      return { pid: null, error: launched.error };
     }
-    editor.unref();
-    this.launchedEditor = editor.pid === undefined ? null : editor;
-    return { pid: editor.pid ?? null, error: null };
+    writeEditorLogNote(projectPath, launched.pid);
+    this.launchedEditor = {
+      pid: launched.pid,
+      startedAt: startTimesOf([launched.pid]).get(launched.pid) ?? null
+    };
+    return { pid: launched.pid, error: null };
   }
   async portsForAnEditor() {
     const lsp = portFromEnvOrNull("GDHARNESS_LSP_PORT") ?? await freePort(DEFAULT_LSP_PORT);
@@ -33314,7 +33332,12 @@ class GodotServer {
       userArgs: given.value
     });
     this.logDebug(`Running Godot project: ${engine.value} ${cmdArgs.join(" ")}`);
-    const started = this.spawnKeptGame(engine.value, cmdArgs, project.value.path, needsItsOwnProcess(asked.value) ? environmentFor({ ...asked.value, runtimeDirectory: runtimeDirectory() }) : undefined);
+    const started = await this.launchKeptGame(engine.value, cmdArgs, project.value.path, needsItsOwnProcess(asked.value) ? environmentFor({ ...asked.value, runtimeDirectory: runtimeDirectory() }) : undefined);
+    if ("error" in started) {
+      return this.createErrorResponse(`The game could not be started: ${started.error}`, [
+        "editor_status says which Godot this server runs and whether it answers"
+      ]);
+    }
     started.announcedBefore = alreadyPlaying;
     this.activeProcess = started;
     const spawnedInstead = this.godotBridge.isConnected() && editorWouldPlay && given.value.length > 0 ? " The editor cannot be handed arguments for a game it plays, so this one was started " + "here: the debug_* tools answer only for a game the editor is playing." : this.godotBridge.isConnected() && editorWouldPlay && needsItsOwnProcess(asked.value) ? " The editor plays a game with its own environment, so a run given one was started " + "here: the debug_* tools answer only for a game the editor is playing." : "";
@@ -33326,7 +33349,7 @@ class GodotServer {
       started: true,
       through: "gdharness",
       alsoRunning: stranded.length === 0 ? undefined : stranded.map((one) => one.pid),
-      pid: started.process.pid ?? null,
+      pid: started.pid,
       arguments: cmdArgs,
       transcript: started.transcript,
       refreshedClasses: refreshed.value,
@@ -33441,7 +33464,6 @@ class GodotServer {
     closeSync2(transcript.fd);
     const playAnswer = asParams(JSON.parse(answer.content[0]?.text ?? "{}"));
     const played = {
-      process: null,
       pid: null,
       log,
       transcript: transcript.path,
@@ -33540,8 +33562,14 @@ class GodotServer {
   }
   async endActiveGame(reason, going) {
     const running = this.activeProcess;
-    const recorded = running?.process === null ? readRunRecord() : null;
-    clearRunRecord((record) => this.couldBeOurs(record.projectPath));
+    const recorded = running !== null && !running.throughEditor ? readRunRecord() : null;
+    const clearTheRecord = () => {
+      clearRunRecord((record) => this.couldBeOurs(record.projectPath));
+    };
+    const aKeeperHoldsIt = running !== null && going && !running.throughEditor && running.pid !== null;
+    if (!aKeeperHoldsIt) {
+      clearTheRecord();
+    }
     if (!running || !going) {
       return true;
     }
@@ -33549,16 +33577,13 @@ class GodotServer {
     const announced = this.announcedPidOf(running);
     if (running.throughEditor) {
       await this.handleViaBridge("stop_playing", {});
-      return await untilGone(null, announced === undefined ? [] : [announced]);
-    }
-    if (running.process !== null) {
-      running.process.kill();
-      return await untilGone(running.process, announced === undefined ? [] : [announced]);
+      return await untilGone(announced === undefined ? [] : [announced]);
     }
     if (running.pid === null) {
       return true;
     }
     if (recorded === null || recorded.pid !== running.pid || !stillTheRecordedRun(recorded)) {
+      clearTheRecord();
       running.endedHere = null;
       running.log.record("warning", `This run was not ended here: pid ${running.pid} no longer answers as the run that was recorded, so nothing was signalled. If that process is still the game, end it yourself; if it is not, it belongs to something else.`);
       return true;
@@ -33571,12 +33596,20 @@ class GodotServer {
     } catch {
       landed = false;
     }
-    const gone = await untilGone(null, [running.pid]);
+    const gone = await untilGone([running.pid]);
+    if (gone) {
+      await this.untilTheExitIsRecorded(running);
+    }
+    if (landed && gone) {
+      running.exitCode = null;
+      running.exitSignal = "SIGTERM";
+    }
+    clearTheRecord();
     running.log.record("info", landed ? `gdharness ended pid ${running.pid}, which the operating system described as ${described}.` : `gdharness signalled pid ${running.pid} and it was already gone; the operating system had described it as ${described}.`);
     return gone;
   }
   spawnGame(godotPath, cmdArgs, env) {
-    const child = spawn(godotPath, cmdArgs, { stdio: ["ignore", "pipe", "pipe"], ...env ? { env } : {} });
+    const child = spawn2(godotPath, cmdArgs, { stdio: ["ignore", "pipe", "pipe"], ...env ? { env } : {} });
     const cancelled = callSignal();
     if (cancelled !== undefined) {
       const end = () => {
@@ -33628,25 +33661,23 @@ class GodotServer {
     });
     return started;
   }
-  spawnKeptGame(godotPath, cmdArgs, projectPath, env) {
+  async launchKeptGame(godotPath, cmdArgs, projectPath, env) {
     const startedAt = Date.now();
     const transcript = openTranscript(startedAt);
-    let child;
-    try {
-      child = spawn(godotPath, cmdArgs, {
-        stdio: ["ignore", transcript.fd, transcript.fd],
-        detached: true,
-        ...env ? { env } : {}
-      });
-    } finally {
-      closeSync2(transcript.fd);
+    closeSync2(transcript.fd);
+    const launched = await launchOutsideTheTree({
+      command: godotPath,
+      args: cmdArgs,
+      ...env === undefined ? {} : { env },
+      run: { transcript: transcript.path, startedAt, projectPath }
+    });
+    if ("error" in launched) {
+      return launched;
     }
-    child.unref();
-    const log = new GameLog;
-    const started = {
-      process: child,
-      pid: child.pid ?? null,
-      log,
+    sweepTranscripts();
+    return {
+      pid: launched.pid,
+      log: new GameLog,
       transcript: transcript.path,
       readOffset: 0,
       projectPath,
@@ -33656,34 +33687,6 @@ class GodotServer {
       throughEditor: false,
       brokeOn: null
     };
-    child.on("exit", (code, signal) => {
-      this.logDebug(`Godot process exited with code ${code ?? "none"}, signal ${signal ?? "none"}`);
-      this.drainTranscript(started);
-      log.finish();
-      started.exitCode = code;
-      started.exitSignal = code === null ? signal : null;
-      if (started.pid !== null) {
-        recordRunEnded(started.pid, { exitCode: started.exitCode, exitSignal: started.exitSignal });
-      }
-    });
-    child.on("error", (err) => {
-      console.error("Failed to start Godot process:", err);
-      log.append("stderr", `${err.message}
-`);
-      started.exitCode = -1;
-    });
-    if (started.pid !== null) {
-      writeRunRecord({
-        pid: started.pid,
-        transcript: transcript.path,
-        startedAt,
-        projectPath,
-        arguments: cmdArgs,
-        command: godotPath
-      });
-    }
-    sweepTranscripts();
-    return started;
   }
   drainTranscript(game) {
     if (game.transcript === null) {
@@ -33739,7 +33742,6 @@ class GodotServer {
     const left = readEditorRunNote();
     const note = left !== null && project !== null && isSameDirectory(left.projectPath, project) ? left : null;
     const picked = {
-      process: null,
       pid: null,
       log: new GameLog,
       transcript: note?.transcript ?? null,
@@ -33876,7 +33878,6 @@ class GodotServer {
       return null;
     }
     const adopted = {
-      process: null,
       pid: record.pid,
       log: new GameLog,
       transcript: record.transcript,
@@ -33886,7 +33887,8 @@ class GodotServer {
       exitCode: null,
       exitSignal: null,
       throughEditor: false,
-      brokeOn: null
+      brokeOn: null,
+      pickedUp: true
     };
     this.drainTranscript(adopted);
     if (!alive(record.pid) || !couldStillBeTheRecordedRun(record)) {
@@ -34021,8 +34023,8 @@ class GodotServer {
   async runStillGoing(run, editorSays) {
     if (!run.throughEditor) {
       const going = stillRunning(run);
-      if (!going && run.process !== null && !exited(run)) {
-        await untilGone(run.process, [], EXIT_REPORTED_WITHIN_MS);
+      if (!going && run.pid !== null && !exited(run) && run.endedUnwatched !== true && typeof run.endedHere !== "string" && !await this.untilTheExitIsRecorded(run)) {
+        run.endedUnwatched = true;
       }
       return going;
     }
@@ -34039,6 +34041,21 @@ class GodotServer {
     }
     return runIsUp(run, said);
   }
+  async untilTheExitIsRecorded(run) {
+    const until = Date.now() + EXIT_REPORTED_WITHIN_MS;
+    for (;; ) {
+      const record = readRunRecord();
+      if (record !== null && record.pid === run.pid && (record.exitCode !== undefined || record.exitSignal !== undefined)) {
+        run.exitCode = record.exitCode ?? null;
+        run.exitSignal = record.exitSignal ?? null;
+        return true;
+      }
+      if (Date.now() >= until) {
+        return false;
+      }
+      await delay3(50);
+    }
+  }
   handleEditorConsole(args) {
     const status = this.godotBridge.getStatus();
     const projectPath = status.projectPath ?? this.ownProject ?? undefined;
@@ -34140,7 +34157,8 @@ class GodotServer {
         throughEditor: run.throughEditor,
         announced: announced !== undefined || run.announcedPid !== undefined,
         couldAnnounce: run.projectPath !== null && existsSync10(join16(run.projectPath, RUNTIME_AUTOLOAD.path)),
-        endedHere: typeof run.endedHere === "string"
+        endedHere: typeof run.endedHere === "string",
+        pickedUp: run.pickedUp === true
       }));
     }
     if (run.pickedUpPlaying === true) {
@@ -34166,7 +34184,7 @@ class GodotServer {
       ...hold,
       endedUnwatched: run.endedUnwatched === true ? true : undefined,
       endedBy: stillRunning(run) ? undefined : run.endedHere ?? null,
-      project: !run.throughEditor && run.process === null ? run.projectPath ?? undefined : undefined,
+      project: run.throughEditor ? undefined : run.projectPath ?? undefined,
       transcript: run.transcript ?? undefined,
       startedAt: new Date(run.startedAt).toISOString(),
       elapsedMs: Date.now() - run.startedAt,

package/build/keeper.js

@@ -0,0 +1,222 @@
+#!/usr/bin/env node
+
+// src/keeper.ts
+import { spawn } from "node:child_process";
+import { closeSync, openSync as openSync2 } from "node:fs";
+
+// src/outside.ts
+import { fileURLToPath } from "node:url";
+var KEEPER_SCRIPT = fileURLToPath(new URL("./keeper.js", import.meta.url));
+function decodeSpec(encoded) {
+  return JSON.parse(Buffer.from(encoded, "base64url").toString("utf8"));
+}
+function readLaunched(printed) {
+  const line = printed.split(`
+`).find((one) => one.trim() !== "")?.trim() ?? "";
+  const pid = /^pid (\d+)$/.exec(line);
+  if (pid?.[1] !== undefined) {
+    return { pid: Number(pid[1]) };
+  }
+  return { error: line.replace(/^error /, "") || "the launcher said nothing" };
+}
+
+// src/run-record.ts
+import { mkdirSync, openSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { basename, join as join2 } from "node:path";
+
+// src/process-children.ts
+import { execFile, execFileSync, spawnSync } from "node:child_process";
+import { promisify } from "node:util";
+var run = promisify(execFile);
+
+// src/runtime-client.ts
+import { tmpdir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+
+// src/launch.ts
+function envValue(name, variables = process.env) {
+  const value = variables[name];
+  return value === undefined || value === "" ? undefined : value;
+}
+
+// src/runtime-client.ts
+function runtimeDirectory(variables = process.env) {
+  const explicit = envValue("GDHARNESS_RUNTIME_DIR", variables);
+  if (explicit) {
+    return explicit;
+  }
+  const perUser = envValue("XDG_RUNTIME_DIR", variables);
+  return join(perUser ?? tmpdir(), "gdharness");
+}
+var ERROR_REPORT_KEEP_MS = 60 * 60 * 1000;
+var verdicts = new Map;
+var LATE_ANSWER_MS = 30 * 60000;
+var lateAnswers = new Map;
+
+// src/run-record.ts
+function runsDirectory() {
+  return join2(runtimeDirectory(), "runs");
+}
+function recordPath() {
+  return join2(runsDirectory(), "run.json");
+}
+function writeRunRecord(record) {
+  mkdirSync(runsDirectory(), { recursive: true });
+  writeFileSync(recordPath(), JSON.stringify(record, null, 2), "utf8");
+}
+function recordRunEnded(pid, ending) {
+  const path = recordPath();
+  const record = recordAt(path);
+  if (record === null || record.pid !== pid) {
+    return;
+  }
+  const written = {
+    ...record,
+    ...ending.exitCode === null ? {} : { exitCode: ending.exitCode },
+    ...ending.exitSignal === null ? {} : { exitSignal: ending.exitSignal }
+  };
+  try {
+    writeFileSync(path, JSON.stringify(written, null, 2), "utf8");
+  } catch {}
+}
+function recordAt(path) {
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync(path, "utf8"));
+  } catch {
+    return null;
+  }
+  if (!parsed || typeof parsed !== "object") {
+    return null;
+  }
+  const fields = parsed;
+  const pid = fields["pid"];
+  const transcript = fields["transcript"];
+  const startedAt = fields["startedAt"];
+  if (typeof pid !== "number" || typeof transcript !== "string" || typeof startedAt !== "number") {
+    return null;
+  }
+  const args = fields["arguments"];
+  return {
+    pid,
+    transcript,
+    startedAt,
+    projectPath: typeof fields["projectPath"] === "string" ? fields["projectPath"] : "",
+    arguments: Array.isArray(args) ? args.filter((value) => typeof value === "string") : [],
+    ...typeof fields["command"] === "string" ? { command: fields["command"] } : {},
+    ...typeof fields["exitCode"] === "number" ? { exitCode: fields["exitCode"] } : {},
+    ...typeof fields["exitSignal"] === "string" ? { exitSignal: fields["exitSignal"] } : {}
+  };
+}
+
+// src/keeper.ts
+async function startDetached(spec, output) {
+  return await new Promise((resolve) => {
+    const child = spawn(spec.command, [...spec.args], {
+      stdio: ["ignore", output, output],
+      detached: true,
+      ...spec.env === undefined ? {} : { env: spec.env }
+    });
+    child.once("error", (error) => {
+      resolve({ error: error.message });
+    });
+    child.once("spawn", () => {
+      resolve(child.pid === undefined ? { error: "the operating system gave it no pid" } : { child, pid: child.pid });
+    });
+  });
+}
+async function launch(encoded) {
+  const spec = decodeSpec(encoded);
+  if (spec.run === undefined) {
+    const started = await startDetached(spec, "ignore");
+    if ("error" in started) {
+      process.stdout.write(`error ${started.error}
+`);
+    } else {
+      started.child.unref();
+      process.stdout.write(`pid ${started.pid}
+`);
+    }
+    process.exit(0);
+  }
+  const keeper = spawn(process.execPath, [KEEPER_SCRIPT, "keep", encoded], {
+    stdio: ["ignore", "pipe", "pipe"],
+    detached: true,
+    windowsHide: true
+  });
+  let printed = "";
+  let complained = "";
+  keeper.once("error", (error) => {
+    process.stdout.write(`error the keeper did not start: ${error.message}
+`);
+    process.exit(0);
+  });
+  keeper.stderr.on("data", (chunk) => {
+    complained += chunk.toString();
+  });
+  keeper.stdout.on("data", (chunk) => {
+    printed += chunk.toString();
+    if (!printed.includes(`
+`)) {
+      return;
+    }
+    const launched = readLaunched(printed);
+    process.stdout.write("pid" in launched ? `pid ${launched.pid}
+` : `error ${launched.error}
+`);
+    keeper.unref();
+    process.exit(0);
+  });
+  keeper.once("close", () => {
+    process.stdout.write(`error the keeper ended before it said anything${complained ? `: ${complained.trim()}` : ""}
+`);
+    process.exit(0);
+  });
+}
+async function keep(encoded) {
+  const spec = decodeSpec(encoded);
+  if (spec.run === undefined) {
+    process.stdout.write(`error a keeper was started without a run
+`);
+    process.exit(1);
+  }
+  const run = spec.run;
+  const transcript = openSync2(run.transcript, "a");
+  let started;
+  try {
+    started = await startDetached(spec, transcript);
+  } finally {
+    closeSync(transcript);
+  }
+  if ("error" in started) {
+    process.stdout.write(`error ${started.error}
+`);
+    process.exit(1);
+  }
+  const { child, pid } = started;
+  writeRunRecord({
+    pid,
+    transcript: run.transcript,
+    startedAt: run.startedAt,
+    projectPath: run.projectPath,
+    arguments: spec.args,
+    command: spec.command
+  });
+  child.once("exit", (code, signal) => {
+    recordRunEnded(pid, { exitCode: code, exitSignal: code === null ? signal : null });
+    process.exit(0);
+  });
+  process.stdout.write(`pid ${pid}
+`);
+  process.stdout.end();
+}
+var [mode, encoded] = process.argv.slice(2);
+if (mode === "launch" && encoded !== undefined) {
+  await launch(encoded);
+} else if (mode === "keep" && encoded !== undefined) {
+  await keep(encoded);
+} else {
+  process.stderr.write(`keeper.js launch|keep <spec>
+`);
+  process.exit(2);
+}

package/package.json

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