gdharness 1.3.56 → 1.3.57

package/build/cli.js

@@ -1784,12 +1784,16 @@ function slotsDrawnOn(count, taker, queue) {
 function inAGate(env = process4.env) {
   return nonEmpty(env[SHARE_VARIABLE]) !== undefined && nonEmpty(env[SHARE_COUNT_VARIABLE]) !== undefined;
 }
-function inheritsSlot(tree, pid, holder, executable) {
+function inheritsSlot(tree, pid, holder, executable, engineStarted) {
   const program = (name) => name.toLowerCase().replace(/\.(?:exe|cmd|bat|com)$/, "");
   const own = program(executable);
-  for (const above of ancestorsIn(tree, pid, holder)) {
+  for (const above of ancestorsIn(tree, pid, holder.pid)) {
     if (program(readCommandLine(tree.get(above)?.command ?? "").executable) !== own) {
-      return above === holder;
+      if (above === holder.pid) {
+        return true;
+      }
+      const started = tree.get(above)?.startedAt ?? engineStarted;
+      return above === holder.engine?.pid && started !== undefined && Math.abs(started - holder.engine.started) <= START_TOLERANCE_MS;
     }
   }
   return false;
@@ -1854,20 +1858,29 @@ function holderOf(content) {
     if (typeof parsed !== "object" || parsed === null) {
       return null;
     }
-    const { pid, started, by, game } = parsed;
-    if (typeof pid !== "number" || !Number.isInteger(pid) || pid <= 0 || typeof started !== "number") {
+    const { by, game, engine } = parsed;
+    const named = namedProcess(parsed);
+    if (named === null) {
       return null;
     }
+    const runs = namedProcess(engine);
     return {
-      pid,
-      started,
+      ...named,
       ...typeof by === "string" && by !== "" ? { by } : {},
-      ...game === true ? { game } : {}
+      ...game === true ? { game } : {},
+      ...runs === null ? {} : { engine: runs }
     };
   } catch {
     return null;
   }
 }
+function namedProcess(value) {
+  if (typeof value !== "object" || value === null) {
+    return null;
+  }
+  const { pid, started } = value;
+  return typeof pid === "number" && Number.isInteger(pid) && pid > 0 && typeof started === "number" ? { pid, started } : null;
+}
 function lockIsFree(content, writtenAt, now, isAlive, startOf) {
   const holder = holderOf(content);
   if (holder === null) {
@@ -1981,7 +1994,9 @@ class EngineSlots {
       return null;
     }
     const tree = await processTree();
-    return tree !== undefined && inheritsSlot(tree, process4.pid, holder.pid, basename3(process4.execPath)) ? lock : null;
+    const engine = holder.engine?.pid;
+    const engineStarted = engine === undefined || tree?.get(engine)?.startedAt !== undefined ? undefined : (await startTimesOf([engine])).get(engine);
+    return tree !== undefined && inheritsSlot(tree, process4.pid, holder, basename3(process4.execPath), engineStarted) ? lock : null;
   }
   markWaiting() {
     const mark = this.waitMarked();
@@ -2172,6 +2187,45 @@ function handSlot(lock, from, to) {
   const holder = content === null ? null : holderOf(content);
   return holder?.pid === from && writeWhole(lock, JSON.stringify(holder.game === true ? { ...to, game: true } : to));
 }
+function nameSlotEngine(lock, holder, engine) {
+  let content;
+  try {
+    content = readWhole(lock);
+  } catch {
+    return false;
+  }
+  const named = content === null ? null : holderOf(content);
+  return named?.pid === holder && writeWhole(lock, JSON.stringify({ ...named, engine }));
+}
+async function nameSlotEngineOf(lock, holder, pid) {
+  const started = (await startTimesOf([pid])).get(pid);
+  if (started !== undefined) {
+    nameSlotEngine(lock, holder, { pid, started });
+  }
+}
+async function slotEngineNamed(lock, run, pidFile) {
+  if (pidFile === undefined) {
+    if (run.pid !== null) {
+      await nameSlotEngineOf(lock, process4.pid, run.pid);
+    }
+    return;
+  }
+  const state = { settled: false };
+  run.settled.finally(() => {
+    state.settled = true;
+  });
+  while (!state.settled) {
+    let written = Number.NaN;
+    try {
+      written = Number(readFileSync6(pidFile, "utf8").trim());
+    } catch {}
+    if (Number.isInteger(written) && written > 0) {
+      await nameSlotEngineOf(lock, process4.pid, written);
+      return;
+    }
+    await delay2(ENGINE_PID_LOOK_MS);
+  }
+}
 function giveBackSlot(lock, pid) {
   try {
     if (holderOf(readFileSync6(lock, "utf8"))?.pid === pid) {
@@ -2290,7 +2344,7 @@ async function inASlot(body) {
     held.release();
   }
 }
-var HELD_VARIABLE = "GODOT_ENGINE_HELD", SLOTS_VARIABLE = "GODOT_ENGINE_SLOTS", SLOT_COUNT_VARIABLE = "GODOT_ENGINE_SLOT_COUNT", PROCESSORS_A_SLOT = 2, START_TOLERANCE_MS = 2000, UNWRITTEN_MS = 1e4, SLOT_LOOK_MS = 1000, SLOT_SETTLE_MS = 50, WAIT_SAID_MS = 20000, COMMAND_WAIT_SAID_MS = 2000, START_READ_MS = 1e4, WAITING_FOLDER = "waiting", QUEUED_FOLDER = "queued", SHARE_VARIABLE = "GODOT_ENGINE_SHARE", SHARE_COUNT_VARIABLE = "GODOT_ENGINE_SHARE_COUNT", GATE_KEPT = 1, TIMED_VARIABLE = "GODOT_ENGINE_TIMED", TIER_VARIABLE = "GODOT_ENGINE_TIER", SEATED_SUFFIX = ".seated", waitsMarked = 0, ours, saidTo, takenBy;
+var HELD_VARIABLE = "GODOT_ENGINE_HELD", SLOTS_VARIABLE = "GODOT_ENGINE_SLOTS", SLOT_COUNT_VARIABLE = "GODOT_ENGINE_SLOT_COUNT", PROCESSORS_A_SLOT = 2, START_TOLERANCE_MS = 2000, UNWRITTEN_MS = 1e4, SLOT_LOOK_MS = 1000, SLOT_SETTLE_MS = 50, WAIT_SAID_MS = 20000, COMMAND_WAIT_SAID_MS = 2000, START_READ_MS = 1e4, WAITING_FOLDER = "waiting", QUEUED_FOLDER = "queued", SHARE_VARIABLE = "GODOT_ENGINE_SHARE", SHARE_COUNT_VARIABLE = "GODOT_ENGINE_SHARE_COUNT", GATE_KEPT = 1, TIMED_VARIABLE = "GODOT_ENGINE_TIMED", TIER_VARIABLE = "GODOT_ENGINE_TIER", SEATED_SUFFIX = ".seated", waitsMarked = 0, ENGINE_PID_LOOK_MS = 100, ours, saidTo, takenBy;
 var init_engine_slots = __esm(() => {
   init_alive();
   init_cache_home();
@@ -13189,9 +13243,13 @@ async function watchedEngine(launch, lock, args, directory, log, silenceSeconds,
       return;
     }
   };
+  const found = (engine) => {
+    watching(engine, true);
+    nameSlotEngineOf(lock, process7.pid, engine);
+  };
   let pid = engineAt();
   if (pid !== undefined) {
-    watching(pid, true);
+    found(pid);
   }
   try {
     let size = 0;
@@ -13206,7 +13264,7 @@ async function watchedEngine(launch, lock, args, directory, log, silenceSeconds,
       if (pid === undefined) {
         pid = engineAt();
         if (pid !== undefined) {
-          watching(pid, true);
+          found(pid);
         }
       }
       const taken = await sample();
@@ -14023,6 +14081,9 @@ function runStarted(executable, args, lock, options, signal) {
       env: onTheSlot(process.env, lock),
       ...signal === undefined ? {} : { signal }
     });
+    if (child.pid !== undefined) {
+      nameSlotEngineOf(lock, process.pid, child.pid);
+    }
     child.stdout.on("data", (chunk) => {
       log.append("stdout", chunk);
     });
@@ -19119,7 +19180,7 @@ var init_tool_definitions = __esm(() => {
         },
         wait: {
           effect: "read",
-          summary: "wait for the run to end, then answer as editor_output does",
+          summary: "wait for the run to end, or to be held by its debugger at a breakpoint, a pause or a step, then answer as editor_output does",
           requires: []
         },
         profile: {
@@ -56713,6 +56774,7 @@ ${error.text}`;
     try {
       const run = this.spawnHeld(godotPath, cmdArgs, onTheSlot(env ?? process.env, held.lock), onDesktop);
       run.settled.finally(held.release);
+      slotEngineNamed(held.lock, run, onDesktop?.files.pid);
       return run;
     } catch (error) {
       held.release();
@@ -57455,14 +57517,33 @@ ${error.text}`;
       return elsewhere;
     }
     const budgetMs = readPositiveNumber(args, "timeoutMs") ?? WAIT_FOR_RUN_MS;
-    const until = Date.now() + budgetMs;
+    const began = Date.now();
+    const until = began + budgetMs;
     const cancelled = callSignal();
+    let held = false;
+    let holdAsked = 0;
     while (cancelled?.aborted !== true && await this.runStillGoing(run) && Date.now() < until) {
       this.drainEditorOutput(run);
       this.drainTranscript(run);
+      if (Date.now() - holdAsked >= HOLD_ASKED_EVERY_MS) {
+        holdAsked = Date.now();
+        if (await this.heldByItsDebugger(run)) {
+          held = true;
+          break;
+        }
+      }
       await delay8(RUN_POLL_MS);
     }
-    return await this.handleGetDebugOutput(args, await this.runStillGoing(run) ? budgetMs : undefined);
+    if (!await this.runStillGoing(run)) {
+      return await this.handleGetDebugOutput(args);
+    }
+    return await this.handleGetDebugOutput(args, held ? { heldAfterMs: Date.now() - began } : { ranOutMs: budgetMs });
+  }
+  async heldByItsDebugger(run) {
+    if (!run.throughEditor) {
+      return run.keeper !== undefined && await this.keptHold(run.keeper) !== null;
+    }
+    return this.dapClient?.holdIsKnown() === true && this.dapClient.whereItStopped() !== null;
   }
   async runStillGoing(run, editorSays) {
     if (!run.throughEditor) {
@@ -57611,7 +57692,7 @@ ${error.text}`;
       "editor_status names every game running on the machine under runtimes"
     ]);
   }
-  async handleGetDebugOutput(args, waitedMs) {
+  async handleGetDebugOutput(args, waited) {
     if (readString(args, "op") === "editor") {
       return this.handleEditorConsole(args);
     }
@@ -57648,8 +57729,11 @@ ${error.text}`;
     if (wanted && cpuSeconds === undefined && stillRunning(run)) {
       notes.push(processToAsk === null ? "cpu was asked for and there is no process to ask: the editor is playing this run and holds it, and the game announced no runtime, so nothing here has its process id. A game with the runtime addon announces one; editor_run start without a connected editor, or with args, starts the game here instead and that run answers cpuSeconds either way." : "cpu was asked for and this platform would not say what the run has used.");
     }
-    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 (waited !== undefined && "ranOutMs" in waited) {
+      notes.push(`The wait of ${waited.ranOutMs}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 (waited !== undefined && "heldAfterMs" in waited) {
+      notes.push(`The wait answered after ${waited.heldAfterMs}ms because the game is held by its debugger, where heldAt says, and a held game does not end: debug_control continue lets it go, and editor_run wait then waits on.`);
     }
     const restarts = run.restartedFrom ?? [];
     if (restarts.length > 0) {
@@ -59507,7 +59591,7 @@ async function runGodotServer() {
   const server = new GodotServer;
   await server.run();
 }
-var TYPE_ARGUMENTS, UPDATE_NOTICE_EVERY = 500, FEEDBACK_NOTICE_EVERY = 250, FAILED_BUDGET = 1e6, ANSWER_BUDGET = 4000000, __dirname2, PARENT_ASKED_AFTER_MS = 5000, EDITOR_SERVERS_START_MS = 20000, HOLD_PING_MS = 2000, SLOWEST_FRAME_RATE = 20, ALONGSIDE_NOTE = "Another call on this game was running while this one was: calls sent together run together and are answered as each finishes, so this answer is not from after the other. Send a call meant to come after another once that one has answered.", OWN_DEBUGGER = " Its debugger is the keeper holding it rather than the editor, so the debug_* tools answer for it all the same: breakpoints stop it, and debug_control pause breaks into it wherever it is, which the editor offers no way to do.", PLAY_STARTS_WITHIN_MS = 30000, KEEPER_ANSWER_MS = 15000, KEEPER_DEBUG_MS, EXIT_REPORTED_WITHIN_MS = 2000, SUCCESSOR_SOUGHT_WITHIN_MS = 20000, CLOSE_ASK_MS = 3000, LONGEST_BOOT_NOTED_MS, PROFILE_SEND_MS = 5000, MOST_GROUPS = 20, RUNTIME_LISTENING_LINE = "[gdharness] runtime listening on ", VALUE_NAMES, BRIDGE_RETRY_MS = 2000, SUCCESSOR_CHECK_MS = 1e4, CONSOLE_WATCH_MS = 250, BOUNDARY_WAIT_MS = 2000, HANDOVER_MS, HANDOVER_POLL_MS = 250, CACHE_WRITE_MS = 2000, STREAMS_GRACE_MS = 2000, PLAYING_STATUS_MS = 1000, SCAN_SETTLED_MS = 500, SLOW_ANSWER_MS = 1000, REIMPORT_TIMEOUT_MS = 300000, OPS_ELSEWHERE, AUDIO_BUS_OPS, STALLED_AFTER_MS = 30000, TEST_TIMEOUT_MS = 600000, TEST_HEARTBEAT_MS = 20000, DEPENDED_FAILED = "Failed to compile depended scripts", LOOPING_AFTER = 100, WAIT_FOR_RUN_MS = 600000, RUN_POLL_MS = 250, PATH_SOLUTIONS, DESTINATION_ARGUMENTS, OUTPUT_PATH_SOLUTIONS, PROJECT_FILE_ARGUMENTS, DEBUG_STATE_CALLS, PROJECT_INFO_SECTIONS2, RUNNER_DIRECTORY = "addons/gdUnit4/", PROFILE_FUNCTIONS = 30, PROFILER_ON_MS = 3000, PROPERTY_PLACES = "It is a property, so each place says whether it writes it (access write), which runs its set block, or reads it (access read), which runs its get block: withinCalls on a read says nothing of the set block, nor on a write of the get block unless the write is a compound one such as +=. Inside the property's own blocks its name is the value stored, which the engine reads and writes without running them, so those lines are not listed.", CALLERS_FOUND_BY_NAME = "Found by name in the project's scripts, since the engine's profiler counts calls and time per function and records nothing about who made them: a method of the same name on another class is listed too, unless one class was asked about and it is called through another class by name or through a variable declared as one. Each place carries the profile's numbers for the function it is written in.", MOST_ENGINE_ENTRIES = 200, MOST_PRINTED_LINES = 50, MOST_UNDECLARED_ERRORS = 20, ERROR_ASSERT = "GdUnitGodotErrorAssertImpl.gd", RAISED_WARNING = " (Warning treated as error.)", PARSE_ERROR2 = "Parse Error: ", EXTERNAL_MEMBER = 'Could not resolve external class member "', STATIC_LIST_HINT;
+var TYPE_ARGUMENTS, UPDATE_NOTICE_EVERY = 500, FEEDBACK_NOTICE_EVERY = 250, FAILED_BUDGET = 1e6, ANSWER_BUDGET = 4000000, __dirname2, PARENT_ASKED_AFTER_MS = 5000, EDITOR_SERVERS_START_MS = 20000, HOLD_PING_MS = 2000, SLOWEST_FRAME_RATE = 20, ALONGSIDE_NOTE = "Another call on this game was running while this one was: calls sent together run together and are answered as each finishes, so this answer is not from after the other. Send a call meant to come after another once that one has answered.", OWN_DEBUGGER = " Its debugger is the keeper holding it rather than the editor, so the debug_* tools answer for it all the same: breakpoints stop it, and debug_control pause breaks into it wherever it is, which the editor offers no way to do.", PLAY_STARTS_WITHIN_MS = 30000, KEEPER_ANSWER_MS = 15000, KEEPER_DEBUG_MS, EXIT_REPORTED_WITHIN_MS = 2000, SUCCESSOR_SOUGHT_WITHIN_MS = 20000, CLOSE_ASK_MS = 3000, LONGEST_BOOT_NOTED_MS, PROFILE_SEND_MS = 5000, MOST_GROUPS = 20, RUNTIME_LISTENING_LINE = "[gdharness] runtime listening on ", VALUE_NAMES, BRIDGE_RETRY_MS = 2000, SUCCESSOR_CHECK_MS = 1e4, CONSOLE_WATCH_MS = 250, BOUNDARY_WAIT_MS = 2000, HANDOVER_MS, HANDOVER_POLL_MS = 250, CACHE_WRITE_MS = 2000, STREAMS_GRACE_MS = 2000, PLAYING_STATUS_MS = 1000, SCAN_SETTLED_MS = 500, SLOW_ANSWER_MS = 1000, REIMPORT_TIMEOUT_MS = 300000, OPS_ELSEWHERE, AUDIO_BUS_OPS, STALLED_AFTER_MS = 30000, TEST_TIMEOUT_MS = 600000, TEST_HEARTBEAT_MS = 20000, DEPENDED_FAILED = "Failed to compile depended scripts", LOOPING_AFTER = 100, WAIT_FOR_RUN_MS = 600000, RUN_POLL_MS = 250, HOLD_ASKED_EVERY_MS = 1000, PATH_SOLUTIONS, DESTINATION_ARGUMENTS, OUTPUT_PATH_SOLUTIONS, PROJECT_FILE_ARGUMENTS, DEBUG_STATE_CALLS, PROJECT_INFO_SECTIONS2, RUNNER_DIRECTORY = "addons/gdUnit4/", PROFILE_FUNCTIONS = 30, PROFILER_ON_MS = 3000, PROPERTY_PLACES = "It is a property, so each place says whether it writes it (access write), which runs its set block, or reads it (access read), which runs its get block: withinCalls on a read says nothing of the set block, nor on a write of the get block unless the write is a compound one such as +=. Inside the property's own blocks its name is the value stored, which the engine reads and writes without running them, so those lines are not listed.", CALLERS_FOUND_BY_NAME = "Found by name in the project's scripts, since the engine's profiler counts calls and time per function and records nothing about who made them: a method of the same name on another class is listed too, unless one class was asked about and it is called through another class by name or through a variable declared as one. Each place carries the profile's numbers for the function it is written in.", MOST_ENGINE_ENTRIES = 200, MOST_PRINTED_LINES = 50, MOST_UNDECLARED_ERRORS = 20, ERROR_ASSERT = "GdUnitGodotErrorAssertImpl.gd", RAISED_WARNING = " (Warning treated as error.)", PARSE_ERROR2 = "Parse Error: ", EXTERNAL_MEMBER = 'Could not resolve external class member "', STATIC_LIST_HINT;
 var init_server = __esm(() => {
   init_dist2();
   init_stdio();

package/build/keeper.js

@@ -8833,20 +8833,29 @@ function holderOf(content) {
     if (typeof parsed !== "object" || parsed === null) {
       return null;
     }
-    const { pid, started, by, game } = parsed;
-    if (typeof pid !== "number" || !Number.isInteger(pid) || pid <= 0 || typeof started !== "number") {
+    const { by, game, engine } = parsed;
+    const named = namedProcess(parsed);
+    if (named === null) {
       return null;
     }
+    const runs = namedProcess(engine);
     return {
-      pid,
-      started,
+      ...named,
       ...typeof by === "string" && by !== "" ? { by } : {},
-      ...game === true ? { game } : {}
+      ...game === true ? { game } : {},
+      ...runs === null ? {} : { engine: runs }
     };
   } catch {
     return null;
   }
 }
+function namedProcess(value) {
+  if (typeof value !== "object" || value === null) {
+    return null;
+  }
+  const { pid, started } = value;
+  return typeof pid === "number" && Number.isInteger(pid) && pid > 0 && typeof started === "number" ? { pid, started } : null;
+}
 async function ownStart() {
   const said = (await startTimesOf([process4.pid])).get(process4.pid);
   return said ?? Math.round(Date.now() - process4.uptime() * 1000);
@@ -8861,6 +8870,16 @@ function handSlot(lock, from, to) {
   const holder = content === null ? null : holderOf(content);
   return holder?.pid === from && writeWhole(lock, JSON.stringify(holder.game === true ? { ...to, game: true } : to));
 }
+function nameSlotEngine(lock, holder, engine) {
+  let content;
+  try {
+    content = readWhole(lock);
+  } catch {
+    return false;
+  }
+  const named = content === null ? null : holderOf(content);
+  return named?.pid === holder && writeWhole(lock, JSON.stringify({ ...named, engine }));
+}
 function giveBackSlot(lock, pid) {
   try {
     if (holderOf(readFileSync5(lock, "utf8"))?.pid === pid) {
@@ -11067,10 +11086,12 @@ async function keep() {
   });
   const slot = run?.slot;
   if (slot !== undefined && keeperStarted !== undefined) {
+    const gameStarted = (await startTimesOf([pid])).get(pid);
     handSlot(slot.lock, slot.from, {
       pid: process.pid,
       started: await keeperStarted,
-      by: `${slot.by}, through the keeper process that runs it`
+      by: `${slot.by}, through the keeper process that runs it`,
+      ...gameStarted === undefined ? {} : { engine: { pid, started: gameStarted } }
     });
   }
   let { code, signal } = await exited;
@@ -11106,6 +11127,9 @@ async function keep() {
       restartedFrom: [...note.restartedFrom ?? [], before]
     };
     writeNoteIfItCan(note);
+    if (slot !== undefined) {
+      nameSlotEngine(slot.lock, process.pid, { pid: next.pid, started: next.startedAt });
+    }
     end = () => {
       try {
         process.kill(next.pid);

package/package.json

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