gdharness 1.1.59 → 1.1.60

package/build/cli.js

@@ -9183,6 +9183,65 @@ function enclosingFunction(source, line, code = codeOf(source)) {
   }
   return null;
 }
+function afterHeader(text, from) {
+  let depth = 0;
+  for (let at = text.indexOf("(", from);at !== -1 && at < text.length; at += 1) {
+    if (text[at] === "(") {
+      depth += 1;
+    } else if (text[at] === ")") {
+      depth -= 1;
+      if (depth === 0) {
+        const colon = text.indexOf(":", at);
+        return colon === -1 ? -1 : colon + 1;
+      }
+    }
+  }
+  return -1;
+}
+function bodyCallsSuper(code, line, lambda) {
+  const lines = code.split(`
+`);
+  const first = lines[line - 1];
+  if (first === undefined) {
+    return false;
+  }
+  const header = lambda ? LAMBDA_HEADER.exec(first) : FUNC_LINE.exec(first);
+  if (header !== null) {
+    const body = afterHeader(first, header.index);
+    if (body !== -1 && first.slice(body).trim() !== "") {
+      return SUPER_CALL.test(first.slice(body));
+    }
+  }
+  const indent = indentOf(first);
+  let lambdaIndent = null;
+  for (let index = line - 1;index < lines.length; index += 1) {
+    const text = lines[index] ?? "";
+    if (text.trim() === "") {
+      continue;
+    }
+    const at = indentOf(text);
+    if (at < indent) {
+      break;
+    }
+    if (lambdaIndent !== null) {
+      if (at > lambdaIndent) {
+        continue;
+      }
+      lambdaIndent = null;
+    }
+    const inner = LAMBDA_HEADER.exec(text);
+    if (SUPER_CALL.test(inner === null ? text : text.slice(0, inner.index))) {
+      return true;
+    }
+    if (inner !== null) {
+      const body = afterHeader(text, inner.index);
+      if (body !== -1 && text.slice(body).trim() === "") {
+        lambdaIndent = at;
+      }
+    }
+  }
+  return false;
+}
 function callSitesOf(source, name) {
   const regions = regionsOf(source);
   const code = codeOf(source, regions);
@@ -9208,7 +9267,7 @@ function collectEnumValues(text, from, into) {
 function isIdentifier(name) {
   return new RegExp(`^${NAME}$`, "u").test(name) && !KEYWORDS.has(name);
 }
-var IDENTIFIER_START, IDENTIFIER_PART, DECLARING, NAME = "[\\p{L}_][\\p{L}\\p{N}_]*", ANNOTATIONS = "(?:@[\\p{L}_][\\p{L}\\p{N}_]*(?:\\([^)]*\\))?\\s+)*", DECLARATION_LINE, CLASS_NAME_LINE, EXTENDS_LINE, EXTENDS_CLAUSE, FUNC_LINE, KEYWORDS;
+var IDENTIFIER_START, IDENTIFIER_PART, DECLARING, NAME = "[\\p{L}_][\\p{L}\\p{N}_]*", ANNOTATIONS = "(?:@[\\p{L}_][\\p{L}\\p{N}_]*(?:\\([^)]*\\))?\\s+)*", DECLARATION_LINE, CLASS_NAME_LINE, EXTENDS_LINE, EXTENDS_CLAUSE, FUNC_LINE, SUPER_CALL, LAMBDA_HEADER, KEYWORDS;
 var init_gdscript_source = __esm(() => {
   IDENTIFIER_START = /[\p{L}_]/u;
   IDENTIFIER_PART = /[\p{L}\p{N}_]/u;
@@ -9218,6 +9277,8 @@ var init_gdscript_source = __esm(() => {
   EXTENDS_LINE = new RegExp(`^${ANNOTATIONS}(?:class_name\\s+${NAME}\\s+)?extends\\s`, "u");
   EXTENDS_CLAUSE = /\bextends(?=\s)/u;
   FUNC_LINE = new RegExp(`^[ \\t]*${ANNOTATIONS}(?:static\\s+)?func\\s+(${NAME})\\s*\\(`, "u");
+  SUPER_CALL = /(?<![\p{L}\p{N}_.])super\s*[.(]/u;
+  LAMBDA_HEADER = new RegExp(`(?<![\\p{L}\\p{N}_])func(?:\\s+${NAME})?\\s*\\(`, "u");
   KEYWORDS = new Set([
     "and",
     "as",
@@ -18218,7 +18279,7 @@ var init_tool_definitions = __esm(() => {
         },
         wait: { summary: "wait for the run to end, then answer as editor_output does", requires: [] },
         profile: {
-          summary: "where the run spends its time by GDScript function, while it runs or after it ended: per function its script, the function (Class.name when the script declares a class_name), the line its body's first statement is on, for a lambda the named function it is written in (within), calls, and self and total milliseconds, sorted by self time, with functionsCounted, scriptMs (the self time of them all) and coveredMs. complete is true when the engine's own totals arrived, which it sends only when the profiler is switched off: the runtime addon does that as a game quits, so a scene that does its work in _ready and quits is covered whole; otherwise the answer is the frames summed so far and the note says what that misses. Self time counts a call into the engine's own methods as the caller's, and a function the profiler started inside is left out, since its time would be counted from the engine's start. The milliseconds are time passed while the function ran, not processor time given to it, so they grow when other processes compete for the processor: compare two profiles taken under the same load. A run started with profile: true is profiled from its start. A game the editor plays that was not is profiled from the moment this is asked, and the answer says so; a run this server started without it is refused, since its debugger is fixed as it starts",
+          summary: "where the run spends its time by GDScript function, while it runs or after it ended: per function its script, the function (Class.name when the script declares a class_name), the line its body's first statement is on, for a lambda the named function it is written in (within), calls, and self and total milliseconds, sorted by self time, with functionsCounted, scriptMs (the self time of them all) and coveredMs. complete is true when the engine's own totals arrived, which it sends only when the profiler is switched off: the runtime addon does that as a game quits, so a scene that does its work in _ready and quits is covered whole; otherwise the answer is the frames summed so far and the note says what that misses. Self time counts a call into the engine's own methods as the caller's, and a call through super too, while the overridden function's row counts it again: such a row carries selfIncludesSuper, so self times along an override chain overlap. A function the profiler started inside is left out, since its time would be counted from the engine's start. The milliseconds are time passed while the function ran, not processor time given to it, so they grow when other processes compete for the processor: compare two profiles taken under the same load. A run started with profile: true is profiled from its start. A game the editor plays that was not is profiled from the moment this is asked, and the answer says so; a run this server started without it is refused, since its debugger is fixed as it starts",
           requires: []
         }
       },
@@ -34131,7 +34192,7 @@ function runtimeRequest(endpoint, command, params, timeoutMs, keepListening = fa
         ok: false,
         reason: "busy",
         requestId: id,
-        message: `${still} Nothing was cancelled: a call that takes longer than the wait goes on and does everything it was asked, so read the state back rather than repeating it. runtime_invoke op result with requestId ${id} answers with its reply once it comes, and timeoutMs waits longer next time. A game held at a breakpoint instead is one debug_state stack answers about.`
+        message: `${still} Nothing was cancelled: a call that takes longer than the wait goes on and does everything it was asked, so read the state back rather than repeating it. runtime_invoke op result with requestId ${id} answers with its reply once it comes. A game held at a breakpoint instead is one debug_state stack answers about.`
       });
     }, timeoutMs);
     socket.setEncoding("utf8");
@@ -42325,25 +42386,36 @@ function signatureParts(signature) {
   return { script: parts.slice(0, -2).join("::"), line: Number.isFinite(line) ? line : 0, function: name };
 }
 function profiledFunctions(totals, limit, sourceOf = () => null) {
-  const rows = rowsOf(totals);
+  const rows = rowsOf(totals, sourceOf);
   const scriptMs = ms(Object.values(totals.functions).reduce((sum, one) => sum + (one.calls > 0 ? one.selfSeconds : 0), 0));
   return {
     functions: rows.slice(0, limit).map((row) => placedLambda(row, sourceOf)),
     omitted: Math.max(0, rows.length - limit),
     scriptMs,
-    counted: rows.length
+    counted: rows.length,
+    superCallers: rows.filter((row) => row.selfIncludesSuper === true).length
   };
 }
-function rowsOf(totals) {
+function rowsOf(totals, sourceOf) {
+  const codes = new Map;
+  const codeOfScript = (script) => {
+    if (!codes.has(script)) {
+      const source = sourceOf(script);
+      codes.set(script, source === null ? null : codeOf(source));
+    }
+    return codes.get(script) ?? null;
+  };
   return Object.entries(totals.functions).filter(([, sum]) => sum.calls > 0).map(([signature, sum]) => {
     const parts = signatureParts(signature);
+    const code = codeOfScript(parts.script);
     return {
       script: parts.script,
       function: parts.function,
       line: parts.line,
       calls: sum.calls,
       selfMs: ms(sum.selfSeconds),
-      totalMs: ms(sum.totalSeconds)
+      totalMs: ms(sum.totalSeconds),
+      ...code !== null && bodyCallsSuper(code, parts.line, parts.function.endsWith("(lambda)")) ? { selfIncludesSuper: true } : {}
     };
   }).sort((a, b) => b.selfMs - a.selfMs || b.totalMs - a.totalMs || a.function.localeCompare(b.function));
 }
@@ -42359,17 +42431,24 @@ function placedLambda(row, sourceOf) {
   return within === null ? row : { ...row, within };
 }
 function callersOf(totals, name, scripts) {
-  const rows = rowsOf(totals);
+  const listed = [...scripts];
+  const sources = new Map(listed);
+  const rows = rowsOf(totals, (script) => sources.get(script) ?? null);
   const bare = bareName(name);
   const target = rows.filter((row) => name.includes(".") ? row.function === name : bareName(row.function) === bare);
   const sites = [];
-  for (const [script, source] of scripts) {
+  for (const [script, source] of listed) {
     for (const site of callSitesOf(source, bare)) {
       const within = site.within === null ? undefined : rows.find((row) => row.script === script && bareName(row.function) === site.within);
       sites.push({
         script,
         ...site,
-        ...within === undefined ? {} : { withinCalls: within.calls, withinSelfMs: within.selfMs, withinTotalMs: within.totalMs }
+        ...within === undefined ? {} : {
+          withinCalls: within.calls,
+          withinSelfMs: within.selfMs,
+          withinTotalMs: within.totalMs,
+          ...within.selfIncludesSuper === true ? { withinSelfIncludesSuper: true } : {}
+        }
       });
     }
   }
@@ -42406,8 +42485,14 @@ import { setTimeout as delay4 } from "node:timers/promises";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 import { promisify as promisify5 } from "node:util";
 function editorRestartTimeoutMs() {
-  const override = Number.parseInt(envValue("GDHARNESS_EDITOR_RESTART_TIMEOUT_MS") ?? "", 10);
-  return Number.isInteger(override) && override > 0 ? override : 90000;
+  return waitFromEnv("GDHARNESS_EDITOR_RESTART_TIMEOUT_MS", 90000);
+}
+function waitFromEnv(variable, fallback) {
+  const override = Number.parseInt(envValue(variable) ?? "", 10);
+  return Number.isInteger(override) && override > 0 ? override : fallback;
+}
+function greetingWaitMs() {
+  return waitFromEnv("GDHARNESS_GREETING_WAIT_MS", 1e4);
 }
 function restartUnderway(note, now = Date.now()) {
   return alive(note.byPid) && now - Date.parse(note.quitAt) < editorRestartTimeoutMs() + 30000;
@@ -42458,6 +42543,14 @@ function captureDetail(payload) {
 function patienceForFrames(frames, atLeast) {
   return Math.max(atLeast, frames / SLOWEST_FRAME_RATE * 1000 + atLeast);
 }
+function longerWaitNote(tool, op, waitedMs) {
+  const spec = TOOL_SPECS.find((one) => one.name === tool);
+  if (spec !== undefined && argumentsOf(spec, op).includes("timeoutMs")) {
+    return "timeoutMs waits longer next time.";
+  }
+  const how = tool === "runtime_wait" && op === "frames" ? `the wait is counted from the number of frames, at ${SLOWEST_FRAME_RATE} a second on top of GDHARNESS_RUNTIME_TIMEOUT_MS, and this game fell below that rate, so ask for fewer frames at a time` : "the wait is GDHARNESS_RUNTIME_TIMEOUT_MS, which is set in the environment the server is started with";
+  return `${tool} ${op} takes no timeoutMs: it was given ${waitedMs}ms, and ${how}.`;
+}
 function projectSpelling(projectPath, absolutePath) {
   return `res://${relative5(realPathOr(projectPath), realPathOr(absolutePath)).replaceAll("\\", "/")}`;
 }
@@ -42537,7 +42630,10 @@ function runIsUp(run, editorSays, editorPlay = null, now = Date.now()) {
 function noCodeWillCome(run) {
   return !exited(run);
 }
-async function untilGone(pids, withinMs = STOP_WAIT_MS) {
+function stopWaitMs() {
+  return waitFromEnv("GDHARNESS_STOP_WAIT_MS", 1e4);
+}
+async function untilGone(pids, withinMs = stopWaitMs()) {
   const gone = () => pids.every((pid) => !alive(pid));
   const deadline = Date.now() + withinMs;
   while (!gone() && Date.now() < deadline) {
@@ -42592,7 +42688,7 @@ function stopVerdict(stop) {
     return {
       stopped: false,
       stillGoing: stop.endedPid,
-      note: `${told} ${STOP_WAIT_MS / 1000} seconds later, so it has not stopped. editor_status says when it has gone, and editor_run stop asks again.`,
+      note: `${told} ${stopWaitMs() / 1000} seconds later, so it has not stopped. editor_status says when it has gone, and editor_run stop asks again.`,
       withChildren: true
     };
   }
@@ -42710,7 +42806,7 @@ function endedToStartThis(ended) {
     return ` ${which} was not ended here: the editor could not be asked to stop it. The editor stops a play before starting the next, so it is not running beside this one if this start reached the editor.`;
   }
   if (ended.ending === "lingering") {
-    return ` ${which} was told to end to start this one and was still running ${STOP_WAIT_MS / 1000} seconds later, so it is running beside this one: editor_status says when it has gone.`;
+    return ` ${which} was told to end to start this one and was still running ${stopWaitMs() / 1000} seconds later, so it is running beside this one: editor_status says when it has gone.`;
   }
   return ` ${which} was ended to start this one; its output is no longer what editor_output answers about.`;
 }
@@ -42827,6 +42923,9 @@ function outsideTheirRanges(spec, args) {
   }
   return complaints;
 }
+function scanWaitMs() {
+  return waitFromEnv("GDHARNESS_SCAN_WAIT_MS", 30000);
+}
 function scanWaitIn(payload) {
   const waited = readNumber(payload, "waitedForEditorScanMs");
   const note = readString(payload, "scanNote");
@@ -42885,7 +42984,7 @@ function scanWaitAnswer(scanned, started = "game") {
   if (scanned.waitedMs === 0) {
     return {};
   }
-  const still = `The editor was still scanning the project after ${SCAN_WAIT_MS / 1000} seconds, so`;
+  const still = `The editor was still scanning the project after ${scanWaitMs() / 1000} seconds, so`;
   return {
     waitedForEditorScanMs: scanned.waitedMs,
     scanNote: !scanned.stillScanning ? undefined : started === "game" ? `${still} this game started during the scan and may have read a class cache being rewritten. If ` + 'editor_output shows "Could not find type" for a class that is declared, editor_rescan ' + "waits for the scan to finish, and a start after it reads the finished cache." : `${still} the engine answering this started during the scan and may have read a class cache being ` + "rewritten, and a class cache it wrote can be written over when the scan finishes. If " + 'engine_messages shows "Could not find type" for a class that is declared, editor_rescan waits ' + "for the scan to finish, and the same call after it reads the finished cache."
@@ -43140,14 +43239,20 @@ function profileAnswer(reading, limit) {
   const table = profiledFunctions(totals, limit, reading.sourceOf);
   const notes = [];
   const addonNote = reading.runtimeAddon ? "" : " This project has no gdharness runtime addon, which switches the profiler off as the game quits so the engine sends its totals: setup installs it.";
-  if (totals.complete) {} else if (reading.running && totals.frames === 0) {
+  const totalsWithheld = reading.runtimeAddon ? " The runtime addon switches the profiler off as the game quits, and did not here: either it was no longer running in this game by then, which a project can arrange for some scenes; or the game ended without taking its tree down, as a crash or a kill does; or the totals did not reach the debugger before the game exited, which the game then says in its output." : addonNote;
+  if (totals.complete && reading.running) {
+    notes.push(`The engine's totals arrived while the game is still running, which it sends only when the profiler is switched off, so ${reading.through === "editor" ? "the editor's Profiler tab or the game itself, through EngineDebugger," : "the game itself, through EngineDebugger,"} switched it off before the game ended. They cover the run up to then and nothing after.`);
+  } else if (totals.complete) {} else if (reading.running && totals.frames === 0) {
     notes.push(`The profiler is on and the game has not finished its first frame yet: a frame is sent as it ends, so a scene doing its work in _ready shows nothing until that returns, and the engine's own totals arrive when the game quits.${addonNote}`);
   } else if (reading.running) {
     notes.push(`The run is still going, so these are the ${totals.frames === 1 ? "one frame" : `${totals.frames} frames`} summed so far${reading.through === "gdharness" ? ", written at most half a second behind" : ""}.`);
   } else if (totals.frames === 0) {
-    notes.push(`The game connected and ended before a frame of the profile reached ${reading.through === "editor" ? "the editor" : "this server"}: the engine sends its totals only when the profiler is switched off, and stops sending as it exits without emptying what it has queued.${addonNote}`);
+    notes.push(`The game connected and ended before a frame of the profile reached ${reading.through === "editor" ? "the editor" : "this server"}: the engine sends its totals only when the profiler is switched off, and stops sending as it exits without emptying what it has queued.${totalsWithheld}`);
   } else {
-    notes.push(`These are the ${totals.frames === 1 ? "one frame" : `${totals.frames} frames`} that arrived, summed, without the engine's own totals, so what the game did after the last of them is not in it: the engine sends its totals only when the profiler is switched off, and stops sending as it exits without emptying what it has queued.${addonNote}`);
+    notes.push(`These are the ${totals.frames === 1 ? "one frame" : `${totals.frames} frames`} that arrived, summed, without the engine's own totals, which it sends only when the profiler is switched off.${totalsWithheld} Not in them is any script time after the last frame sent: a frame still queued as the game exited, since the engine stops sending without emptying its queue, and what scripts did as it quit, such as in _exit_tree. That can be nothing: a scene that does its work in _ready and quits has all of it in its first frame.`);
+  }
+  if (table.superCallers > 0) {
+    notes.push(`${table.superCallers === 1 ? "One function calls" : `${table.superCallers} functions call`} through super, marked selfIncludesSuper: the engine takes every other call out of the caller's self time, and not a super call, so ${table.superCallers === 1 ? "its" : "their"} selfMs holds the overridden function's time, which that function's own row counts again. Self time therefore cannot be added along an override chain, and scriptMs counts the time under a super call once more for each level above it.`);
   }
   notes.push(...cappedNotes(totals));
   if (totals.unreadable > 0) {
@@ -43884,7 +43989,7 @@ class GodotServer {
   }
   async dispatch(tool, op, args) {
     if (tool !== "editor_status" && this.godotBridge.isArriving()) {
-      await this.waitForBridge(() => !this.godotBridge.isArriving(), Date.now() + GREETING_WAIT_MS);
+      await this.waitForBridge(() => !this.godotBridge.isArriving(), Date.now() + greetingWaitMs());
     }
     if (ENGINE_PASSES[tool]?.[op] !== undefined) {
       return op === "reimport" ? await this.handleReimport(args) : await this.handleRefreshUids(args);
@@ -44044,7 +44149,7 @@ class GodotServer {
               depth: depth ?? 3,
               include_properties: readBoolean(args, "includeProperties") ?? false,
               properties: readArray(args, "properties") ?? []
-            }, patience);
+            }, { tool: "runtime_inspect", op, patience });
           }
           case "find":
             return await this.handleFindRuntimeNodes(args, patience);
@@ -44054,17 +44159,17 @@ class GodotServer {
               root: readNonEmptyString(args, "nodePath") ?? "/root",
               include_hidden: readBoolean(args, "includeHidden") ?? false,
               limit: readPositiveNumber(args, "limit") ?? 500
-            }, patience);
+            }, { tool: "runtime_inspect", op, patience });
           case "rect":
-            return await this.handleRuntimeCommand("get_rect", { ...whichGame(args), path: readNonEmptyString(args, "nodePath") ?? "" }, patience);
+            return await this.handleRuntimeCommand("get_rect", { ...whichGame(args), path: readNonEmptyString(args, "nodePath") ?? "" }, { tool: "runtime_inspect", op, patience });
           case "property":
             return await this.handleRuntimeCommand("get_property", {
               ...whichGame(args),
               path: readNonEmptyString(args, "nodePath") ?? "",
               property: readNonEmptyString(args, "property") ?? ""
-            }, patience);
+            }, { tool: "runtime_inspect", op, patience });
           default:
-            return await this.handleRuntimeCommand("get_metrics", { ...whichGame(args), metrics: readArray(args, "metrics") ?? [] }, patience);
+            return await this.handleRuntimeCommand("get_metrics", { ...whichGame(args), metrics: readArray(args, "metrics") ?? [] }, { tool: "runtime_inspect", op, patience });
         }
       }
       case "runtime_invoke": {
@@ -44077,16 +44182,16 @@ class GodotServer {
           path: readNonEmptyString(args, "nodePath") ?? "",
           property: readString(args, "property") ?? "",
           value: args["value"]
-        }, patience) : await this.handleRuntimeCommand("call_method", {
+        }, { tool: "runtime_invoke", op, patience }) : await this.handleRuntimeCommand("call_method", {
           ...whichGame(args),
           path: readNonEmptyString(args, "nodePath") ?? "",
           method: readString(args, "method") ?? "",
           args: readArray(args, "args") ?? [],
           ...args["properties"] === undefined ? {} : { properties: args["properties"] }
-        }, patience);
+        }, { tool: "runtime_invoke", op, patience });
       }
       case "runtime_capture":
-        return await this.handleRuntimeCommand(op === "screenshot" ? "capture_screenshot" : "capture_viewport", args);
+        return await this.handleRuntimeCommand(op === "screenshot" ? "capture_screenshot" : "capture_viewport", args, { tool: "runtime_capture", op });
       case "runtime_input":
         if (op === "click") {
           if (readNonEmptyString(args, "nodePath") === undefined && readNonEmptyString(args, "says") === undefined) {
@@ -44099,7 +44204,7 @@ class GodotServer {
             double: readBoolean(args, "doubleClick") ?? false,
             ...readNonEmptyString(args, "says") === undefined ? {} : { says: readNonEmptyString(args, "says") },
             ...args["index"] === undefined ? {} : { index: args["index"] }
-          });
+          }, { tool: "runtime_input", op });
         }
         if (op === "choose") {
           return await this.handleRuntimeCommand("choose", {
@@ -44107,9 +44212,9 @@ class GodotServer {
             path: readNonEmptyString(args, "nodePath") ?? "",
             text: readString(args, "text") ?? "",
             ...args["index"] === undefined ? {} : { index: args["index"] }
-          });
+          }, { tool: "runtime_input", op });
         }
-        return await this.handleRuntimeCommand(`inject_${op}`, args);
+        return await this.handleRuntimeCommand(`inject_${op}`, args, { tool: "runtime_input", op });
       case "runtime_wait":
         return await this.handleRuntimeWait(op, args);
       case "debug_breakpoint": {
@@ -44338,7 +44443,7 @@ class GodotServer {
       const answered = Date.now();
       if (status["scanning"] === true || status["importing"] === true || status["pending"] === true) {
         sawAScan = true;
-        if (Date.now() - started >= SCAN_WAIT_MS) {
+        if (Date.now() - started >= scanWaitMs()) {
           return { waitedMs: Date.now() - started, stillScanning: true };
         }
         await new Promise((settle) => setTimeout(settle, 100));
@@ -45685,7 +45790,7 @@ class GodotServer {
       ]);
     }
     if (!hasSaidWhoItIs(before)) {
-      return this.createErrorResponse(`The editor has connected and has not said who it is within ${GREETING_WAIT_MS / 1000}s, so whether this server or the editor itself restarts it cannot be told.`, ["editor_status says when it has, under greeting while it has not", "Then ask for the restart again"]);
+      return this.createErrorResponse(`The editor has connected and has not said who it is within ${greetingWaitMs() / 1000}s, so whether this server or the editor itself restarts it cannot be told.`, ["editor_status says when it has, under greeting while it has not", "Then ask for the restart again"]);
     }
     const mine = before.openedByAServer === true && before.projectPath !== undefined;
     if (!mine && args["hidden"] === true) {
@@ -46300,7 +46405,7 @@ class GodotServer {
     game.brokeOn = halt.text;
     game.log.record("error", halt.text);
   }
-  async untilTheEditorStopsPlaying(withinMs = STOP_WAIT_MS) {
+  async untilTheEditorStopsPlaying(withinMs = stopWaitMs()) {
     const deadline = Date.now() + withinMs;
     for (;; ) {
       if ((await this.editorPlayingState())?.playing === false) {
@@ -46394,7 +46499,7 @@ class GodotServer {
       running.endedThrough = "signal";
     }
     clearTheRecord();
-    running.log.record(gone ? "info" : "warning", declined !== null ? `gdharness could not signal pid ${running.pid}: the operating system refused it (${declined}). It had described that process as ${described}.` : !gone ? `gdharness signalled pid ${running.pid}, which the operating system described as ${described}, and it was still running ${STOP_WAIT_MS / 1000} seconds later.` : 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}.`);
+    running.log.record(gone ? "info" : "warning", declined !== null ? `gdharness could not signal pid ${running.pid}: the operating system refused it (${declined}). It had described that process as ${described}.` : !gone ? `gdharness signalled pid ${running.pid}, which the operating system described as ${described}, and it was still running ${stopWaitMs() / 1000} seconds later.` : 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 ? "gone" : "lingering";
   }
   async endThroughTheKeeper(run, pid, keeper) {
@@ -46414,7 +46519,7 @@ class GodotServer {
       run.exitCode = null;
       run.exitSignal = "SIGTERM";
     }
-    run.log.record(gone ? "info" : "warning", !gone ? `gdharness had the keeper holding pid ${pid} end it, and it was still running ${STOP_WAIT_MS / 1000} seconds later.` : asked === "signalled" ? `gdharness ended pid ${pid} through the keeper holding it.` : `gdharness asked the keeper holding pid ${pid} to end it, and it had already gone.`);
+    run.log.record(gone ? "info" : "warning", !gone ? `gdharness had the keeper holding pid ${pid} end it, and it was still running ${stopWaitMs() / 1000} seconds later.` : asked === "signalled" ? `gdharness ended pid ${pid} through the keeper holding it.` : `gdharness asked the keeper holding pid ${pid} to end it, and it had already gone.`);
     return gone ? "gone" : "lingering";
   }
   spawnGame(godotPath, cmdArgs, env) {
@@ -47339,7 +47444,7 @@ class GodotServer {
       ...landed ? { endedThrough: "signal" } : {},
       ...childrenFields(ended),
       exitedBeforeStop: !landed,
-      note: `${!gone ? `pid ${pid} was told to end and was still running ${STOP_WAIT_MS / 1000} seconds later, so it has not stopped: a game of this project that no server here was holding,` : landed ? `pid ${pid} was ended: a game of this project that no server here was holding,` : `pid ${pid} had already gone when it was signalled: a game of this project that no server here was holding,`} identified by its announcement and by its command line, ${read.executable} run with --path ${read.projectPath ?? ""}. Nothing here read what it printed or holds its exit code, so neither is in this answer.${gone ? "" : " editor_status says when it has gone."} ${aboutTheChildren(ended, false)}`
+      note: `${!gone ? `pid ${pid} was told to end and was still running ${stopWaitMs() / 1000} seconds later, so it has not stopped: a game of this project that no server here was holding,` : landed ? `pid ${pid} was ended: a game of this project that no server here was holding,` : `pid ${pid} had already gone when it was signalled: a game of this project that no server here was holding,`} identified by its announcement and by its command line, ${read.executable} run with --path ${read.projectPath ?? ""}. Nothing here read what it printed or holds its exit code, so neither is in this answer.${gone ? "" : " editor_status says when it has gone."} ${aboutTheChildren(ended, false)}`
     });
   }
   async whatTheRunStarted(run) {
@@ -48075,7 +48180,8 @@ class GodotServer {
     }
     return `The game this server started (${which}) is still coming up and has not announced its runtime after a wait of ${Math.min(budgetMs, remaining)}ms, so there is nothing to talk to yet. It is still running: ask again in a moment rather than starting another.`;
   }
-  async handleRuntimeCommand(command, args, timeoutMs = this.runtimeTimeoutMs()) {
+  async handleRuntimeCommand(command, args, asked) {
+    const timeoutMs = asked.patience ?? this.runtimeTimeoutMs();
     const { op: _op, projectPath, pid, outputPath, ...params } = asParams(args);
     const waited = typeof pid === "number" ? null : await this.ownRunOnItsWay(typeof projectPath === "string" ? projectPath : this.ownProject, timeoutMs);
     if (waited !== null) {
@@ -48128,7 +48234,7 @@ ${staleNote}`);
           requestId: reply.requestId,
           command,
           waitedMs: timeoutMs,
-          note: reply.message,
+          note: `${reply.message} ${longerWaitNote(asked.tool, asked.op, timeoutMs)}`,
           ...answeredBy,
           ...stale
         });
@@ -48228,13 +48334,13 @@ ${staleNote}`}`
       limit: readPositiveNumber(args, "limit") ?? 100,
       ...property === undefined ? {} : { property },
       ...includeHidden === undefined ? {} : { include_hidden: includeHidden }
-    }, patience);
+    }, { tool: "runtime_inspect", op: "find", patience });
   }
   async handleRuntimeWait(op, args) {
     if (op === "frames") {
       const frames = readPositiveNumber(args, "frames") ?? 1;
       const waited = patienceForFrames(frames, this.runtimeTimeoutMs());
-      return await this.handleRuntimeCommand("wait_frames", { ...whichGame(args), frames }, waited);
+      return await this.handleRuntimeCommand("wait_frames", { ...whichGame(args), frames }, { tool: "runtime_wait", op, patience: waited });
     }
     const timeoutMs = readPositiveNumber(args, "timeoutMs") ?? 5000;
     const asked = readNonEmptyString(args, "nodePath");
@@ -48248,7 +48354,7 @@ ${staleNote}`}`
       path: nodePath,
       signal: readString(args, "signal") ?? "",
       timeout_ms: timeoutMs
-    }, patience) : await this.handleRuntimeCommand("wait_until", {
+    }, { tool: "runtime_wait", op, patience }) : await this.handleRuntimeCommand("wait_until", {
       ...whichGame(args),
       path: nodePath,
       property: readString(args, "property") ?? "",
@@ -48256,7 +48362,7 @@ ${staleNote}`}`
       ...readNonEmptyString(args, "says") === undefined ? {} : { says: readNonEmptyString(args, "says") },
       ...readBoolean(args, "includeHidden") === undefined ? {} : { include_hidden: readBoolean(args, "includeHidden") },
       timeout_ms: timeoutMs
-    }, patience);
+    }, { tool: "runtime_wait", op, patience });
   }
 }
 async function runGodotServer() {
@@ -48264,7 +48370,7 @@ async function runGodotServer() {
   const server = new GodotServer;
   await server.run();
 }
-var UPDATE_NOTICE_EVERY = 500, FEEDBACK_NOTICE_EVERY = 250, run4, __dirname2, GREETING_WAIT_MS = 1e4, HOLD_PING_MS = 2000, SLOWEST_FRAME_RATE = 20, PLAY_STARTS_WITHIN_MS = 30000, STOP_WAIT_MS = 1e4, KEEPER_ANSWER_MS = 15000, EXIT_REPORTED_WITHIN_MS = 2000, CONSOLE_WRAPPER, LONGEST_BOOT_NOTED_MS, MOST_GROUPS = 20, 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, SCAN_WAIT_MS = 30000, STREAMS_GRACE_MS = 2000, PLAYING_STATUS_MS = 1000, SCAN_START_MS = 2000, SCAN_SETTLED_MS = 500, REIMPORT_TIMEOUT_MS = 300000, AUDIO_BUS_OPS, STALLED_AFTER_MS = 30000, TEST_HEARTBEAT_MS = 20000, DEPENDED_FAILED = "Failed to compile depended scripts", WAIT_FOR_RUN_MS = 600000, RUN_POLL_MS = 250, PATH_SOLUTIONS, PROJECT_FILE_ARGUMENTS, DEBUG_STATE_CALLS, PROJECT_INFO_SECTIONS2, RUNNER_DIRECTORY = "addons/gdUnit4/", PROFILE_FUNCTIONS = 30, PROFILER_ON_MS = 3000, 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. Each place carries the profile's numbers for the function it is written in.", MOST_ENGINE_ENTRIES = 200, ERROR_ASSERT = "GdUnitGodotErrorAssertImpl.gd", EXTERNAL_MEMBER = 'Could not resolve external class member "';
+var UPDATE_NOTICE_EVERY = 500, FEEDBACK_NOTICE_EVERY = 250, run4, __dirname2, HOLD_PING_MS = 2000, SLOWEST_FRAME_RATE = 20, PLAY_STARTS_WITHIN_MS = 30000, KEEPER_ANSWER_MS = 15000, EXIT_REPORTED_WITHIN_MS = 2000, CONSOLE_WRAPPER, LONGEST_BOOT_NOTED_MS, MOST_GROUPS = 20, 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_START_MS = 2000, SCAN_SETTLED_MS = 500, REIMPORT_TIMEOUT_MS = 300000, AUDIO_BUS_OPS, STALLED_AFTER_MS = 30000, TEST_HEARTBEAT_MS = 20000, DEPENDED_FAILED = "Failed to compile depended scripts", WAIT_FOR_RUN_MS = 600000, RUN_POLL_MS = 250, PATH_SOLUTIONS, PROJECT_FILE_ARGUMENTS, DEBUG_STATE_CALLS, PROJECT_INFO_SECTIONS2, RUNNER_DIRECTORY = "addons/gdUnit4/", PROFILE_FUNCTIONS = 30, PROFILER_ON_MS = 3000, 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. Each place carries the profile's numbers for the function it is written in.", MOST_ENGINE_ENTRIES = 200, ERROR_ASSERT = "GdUnitGodotErrorAssertImpl.gd", EXTERNAL_MEMBER = 'Could not resolve external class member "';
 var init_server3 = __esm(() => {
   init_mcp();
   init_stdio2();

package/build/godot/addons/gdharness_editor/tools/play_tools.gd

@@ -34,6 +34,14 @@ func set_editor_plugin(plugin: EditorPlugin) -> void:
 
 
 func _process(_delta: float) -> void:
+	_count_a_play_begun()
+
+
+## Counts a play the editor has begun since the last look, whoever began it. Looked at every frame
+## and before the count is read: read alone, a play begun in this frame went uncounted until this
+## node's turn came round, and a server asking before then was told the earlier play's number with
+## "playing", which it took for the earlier play still going.
+func _count_a_play_begun() -> void:
 	var playing: bool = EditorInterface.is_playing_scene()
 	if playing and not _was_playing:
 		if _awaited:
@@ -231,6 +239,7 @@ static func _leave() -> void:
 
 
 func playing_status(_args: Dictionary) -> Dictionary:
+	_count_a_play_begun()
 	var playing: bool = EditorInterface.is_playing_scene()
 	# The debugger's port with it, read now rather than remembered: it is taken again before every
 	# play, so the one from when this editor greeted the server is a number it has moved off.

package/build/godot/addons/gdharness_editor/tools/profile_tools.gd

@@ -17,6 +17,11 @@ const Read = preload("../reading.gd")
 ## the server keeps this below the queue the project sets; this is that for the engine's default.
 const FRAME_FUNCTIONS: int = 1536
 const DEBUGGER_CLASS: String = "ScriptEditorDebugger"
+## What a quitting game sends after its profile's totals, and the answer it waits for. Kept in step
+## with the runtime addon's runtime_autoload.gd.
+const PROFILE_CAPTURE: String = "gdharness"
+const PROFILE_SENT: String = "gdharness:profile_sent"
+const PROFILE_RECEIVED: String = "gdharness:profile_received"
 
 
 ## The editor's debugger sessions, numbered as the editor numbers its debugger tabs.
@@ -32,6 +37,17 @@ class Sessions:
 		if joined != OK:
 			push_error("gdharness could not watch debugger session %d start: %d" % [session_id, joined])
 
+	func _has_capture(capture: String) -> bool:
+		return capture == PROFILE_CAPTURE
+
+	## Answers a quitting game that its profile's totals arrived, which it waits for before it exits.
+	## The editor reads a session's messages in order, so the totals sent before this have been read.
+	func _capture(message: String, _data: Array, session_id: int) -> bool:
+		if message != PROFILE_SENT:
+			return false
+		get_session(session_id).send_message(PROFILE_RECEIVED, [])
+		return true
+
 
 var _editor_plugin: EditorPlugin = null
 var _sessions: Sessions = null

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

@@ -27,9 +27,21 @@ const BIND_ADDRESS_SETTING: String = "gdharness/runtime/bind_address"
 ## expects. A fixed port is for a client that cannot read the announcement.
 const PORT_SETTING: String = "gdharness/runtime/port"
 
-## How long a profiled game waits as it leaves for its profile to be sent: the debugger's thread
-## sends every 6.9 ms, so this is many of its turns.
-const PROFILE_SEND_MS: int = 100
+## The debugger messages that confirm a profile's totals arrived: the game sends the first after
+## them, and the debugger answers with the second once it has read that far. Kept in step with
+## `PROFILE_SENT` and `PROFILE_RECEIVED` in src/script-profile.ts and the editor addon's
+## profile_tools.gd.
+const PROFILE_CAPTURE: String = "gdharness"
+const PROFILE_SENT: String = "gdharness:profile_sent"
+const PROFILE_RECEIVED: String = "gdharness:profile_received"
+
+## The longest a quitting game waits for that answer. A debugger that never gives one, such as an
+## editor without the gdharness addon, holds every profiled exit this long.
+const PROFILE_CONFIRM_MS: int = 3000
+
+## How many calls of `EngineDebugger.line_poll` read the debugger's messages once: it reads them
+## on every 2048th call and only counts the others.
+const POLLS_PER_READ: int = 2048
 
 ## How the engine is told to run a script instead of the game: `godot -s thing.gd`.
 const SCRIPT_FLAGS: PackedStringArray = ["-s", "--script"]
@@ -90,6 +102,7 @@ var _commands: Dictionary = {}
 ## Empty when the markers cannot be read, as in a copy made by hand.
 var _loaded_version: String = _read_marker(VERSION_MARKER)
 var _loaded_digest: String = _read_marker(DIGEST_MARKER)
+var _profile_received: bool = false
 
 
 func _init() -> void:
@@ -125,12 +138,14 @@ func _ready() -> void:
 	# even be un-paused over the socket. A debug server has to stay responsive while the game
 	# is frozen, to inspect, capture, inject or resume it.
 	process_mode = Node.PROCESS_MODE_ALWAYS
+	var watched: int = get_tree().root.tree_exiting.connect(_send_the_profile)
+	if watched != OK:
+		push_error("gdharness could not watch for the game quitting: %d" % watched)
 	_report_errors()
 	_start_server()
 
 
 func _exit_tree() -> void:
-	_send_the_profile()
 	if _errors != null:
 		OS.remove_logger(_errors)
 		_errors.close()
@@ -138,16 +153,51 @@ func _exit_tree() -> void:
 	_cleanup()
 
 
-## A profiled run's totals, sent as the game leaves the tree.
+## A profiled run's totals, sent as the game quits.
 ##
 ## The engine sends its script profiler's totals only when the profiler is switched off, and at
 ## exit it is torn down without being switched off, so a scene that did its work in _ready and
-## quit took its whole profile with it, last frame included. The wait is for the debugger's own
-## thread, which sends what is queued every few milliseconds and stops without emptying the queue.
+## quit took its whole profile with it, last frame included.
+##
+## The totals go out on the debugger's own thread, which stops without emptying its queue, so the
+## game waits until the debugger says it has read them. A fixed wait of 100 ms lost the totals of
+## games quitting under load, whose debugger thread did not get its turn in time.
+##
+## On the root leaving rather than this node: the root leaves only as the game quits, and after
+## every other node's _exit_tree, so what those do is counted. A project that sent this node away
+## mid-run had the profiler switched off then, and its run answered as complete with none of the
+## frames after it.
 func _send_the_profile() -> void:
-	if EngineDebugger.is_active() and EngineDebugger.is_profiling("servers"):
-		EngineDebugger.profiler_enable("servers", false)
-		OS.delay_msec(PROFILE_SEND_MS)
+	if not (EngineDebugger.is_active() and EngineDebugger.is_profiling("servers")):
+		return
+	_profile_received = false
+	if not EngineDebugger.has_capture(PROFILE_CAPTURE):
+		EngineDebugger.register_message_capture(PROFILE_CAPTURE, _on_debugger_message)
+	EngineDebugger.profiler_enable("servers", false)
+	EngineDebugger.send_message(PROFILE_SENT, [])
+	var deadline: int = Time.get_ticks_msec() + PROFILE_CONFIRM_MS
+	while not _profile_received and Time.get_ticks_msec() < deadline:
+		for _poll: int in POLLS_PER_READ:
+			EngineDebugger.line_poll()
+		OS.delay_msec(5)
+	EngineDebugger.unregister_message_capture(PROFILE_CAPTURE)
+	if not _profile_received:
+		print(
+			(
+				(
+					"[gdharness] the debugger did not confirm the profiler's totals within %d ms, so the"
+					+ " profile may be the frames that arrived without them"
+				)
+				% PROFILE_CONFIRM_MS
+			)
+		)
+
+
+func _on_debugger_message(message: String, _data: Array) -> bool:
+	if PROFILE_CAPTURE + ":" + message == PROFILE_RECEIVED:
+		_profile_received = true
+		return true
+	return false
 
 
 ## The engine's error reports, written to a file for the server, for a game the editor plays, and

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

@@ -331,6 +331,7 @@ func _wait_until_said(node_path: String, said: String, timeout_ms: int, include_
 	var looks: int = 0
 	var looked_usec: int = 0
 	var next_look: int = 0
+	var looked_at_frame: int = 0
 	var found: bool = false
 	while true:
 		if Time.get_ticks_usec() >= next_look:
@@ -340,13 +341,19 @@ func _wait_until_said(node_path: String, said: String, timeout_ms: int, include_
 			var took: int = Time.get_ticks_usec() - looking
 			looked_usec += took
 			next_look = Time.get_ticks_usec() + took * LOOKS_APART
+			looked_at_frame = frames
 		if found or Time.get_ticks_msec() - started >= timeout_ms:
 			break
 		await _host.get_tree().process_frame
 		frames += 1
 	# One more look at the end, so words that arrived between two paced looks are not answered as
-	# never having come.
+	# never having come. Taken once a whole frame has run since the last look, which is two frame
+	# starts: a first look that outlasted the timeout otherwise left none, so the wait answered with
+	# the game not having run at all, and a command sent during that look not yet read.
 	if not found:
+		while frames - looked_at_frame < 2:
+			await _host.get_tree().process_frame
+			frames += 1
 		var last: int = Time.get_ticks_usec()
 		found = _anything_says(node_path, said, include_hidden)
 		looks += 1

package/build/index.js

@@ -25964,7 +25964,7 @@ function runtimeRequest(endpoint, command, params, timeoutMs, keepListening = fa
         ok: false,
         reason: "busy",
         requestId: id,
-        message: `${still} Nothing was cancelled: a call that takes longer than the wait goes on and does everything it was asked, so read the state back rather than repeating it. runtime_invoke op result with requestId ${id} answers with its reply once it comes, and timeoutMs waits longer next time. A game held at a breakpoint instead is one debug_state stack answers about.`
+        message: `${still} Nothing was cancelled: a call that takes longer than the wait goes on and does everything it was asked, so read the state back rather than repeating it. runtime_invoke op result with requestId ${id} answers with its reply once it comes. A game held at a breakpoint instead is one debug_state stack answers about.`
       });
     }, timeoutMs);
     socket.setEncoding("utf8");
@@ -26552,6 +26552,67 @@ function enclosingFunction(source, line, code = codeOf(source)) {
   }
   return null;
 }
+var SUPER_CALL = /(?<![\p{L}\p{N}_.])super\s*[.(]/u;
+var LAMBDA_HEADER = new RegExp(`(?<![\\p{L}\\p{N}_])func(?:\\s+${NAME})?\\s*\\(`, "u");
+function afterHeader(text, from) {
+  let depth = 0;
+  for (let at = text.indexOf("(", from);at !== -1 && at < text.length; at += 1) {
+    if (text[at] === "(") {
+      depth += 1;
+    } else if (text[at] === ")") {
+      depth -= 1;
+      if (depth === 0) {
+        const colon = text.indexOf(":", at);
+        return colon === -1 ? -1 : colon + 1;
+      }
+    }
+  }
+  return -1;
+}
+function bodyCallsSuper(code, line, lambda) {
+  const lines = code.split(`
+`);
+  const first = lines[line - 1];
+  if (first === undefined) {
+    return false;
+  }
+  const header = lambda ? LAMBDA_HEADER.exec(first) : FUNC_LINE.exec(first);
+  if (header !== null) {
+    const body = afterHeader(first, header.index);
+    if (body !== -1 && first.slice(body).trim() !== "") {
+      return SUPER_CALL.test(first.slice(body));
+    }
+  }
+  const indent = indentOf(first);
+  let lambdaIndent = null;
+  for (let index = line - 1;index < lines.length; index += 1) {
+    const text = lines[index] ?? "";
+    if (text.trim() === "") {
+      continue;
+    }
+    const at = indentOf(text);
+    if (at < indent) {
+      break;
+    }
+    if (lambdaIndent !== null) {
+      if (at > lambdaIndent) {
+        continue;
+      }
+      lambdaIndent = null;
+    }
+    const inner = LAMBDA_HEADER.exec(text);
+    if (SUPER_CALL.test(inner === null ? text : text.slice(0, inner.index))) {
+      return true;
+    }
+    if (inner !== null) {
+      const body = afterHeader(text, inner.index);
+      if (body !== -1 && text.slice(body).trim() === "") {
+        lambdaIndent = at;
+      }
+    }
+  }
+  return false;
+}
 function callSitesOf(source, name) {
   const regions = regionsOf(source);
   const code = codeOf(source, regions);
@@ -33123,25 +33184,36 @@ function signatureParts(signature) {
 }
 var ms = (seconds) => Math.round(seconds * 1e6) / 1000;
 function profiledFunctions(totals, limit, sourceOf = () => null) {
-  const rows = rowsOf(totals);
+  const rows = rowsOf(totals, sourceOf);
   const scriptMs = ms(Object.values(totals.functions).reduce((sum, one) => sum + (one.calls > 0 ? one.selfSeconds : 0), 0));
   return {
     functions: rows.slice(0, limit).map((row) => placedLambda(row, sourceOf)),
     omitted: Math.max(0, rows.length - limit),
     scriptMs,
-    counted: rows.length
+    counted: rows.length,
+    superCallers: rows.filter((row) => row.selfIncludesSuper === true).length
   };
 }
-function rowsOf(totals) {
+function rowsOf(totals, sourceOf) {
+  const codes = new Map;
+  const codeOfScript = (script) => {
+    if (!codes.has(script)) {
+      const source = sourceOf(script);
+      codes.set(script, source === null ? null : codeOf(source));
+    }
+    return codes.get(script) ?? null;
+  };
   return Object.entries(totals.functions).filter(([, sum]) => sum.calls > 0).map(([signature, sum]) => {
     const parts = signatureParts(signature);
+    const code = codeOfScript(parts.script);
     return {
       script: parts.script,
       function: parts.function,
       line: parts.line,
       calls: sum.calls,
       selfMs: ms(sum.selfSeconds),
-      totalMs: ms(sum.totalSeconds)
+      totalMs: ms(sum.totalSeconds),
+      ...code !== null && bodyCallsSuper(code, parts.line, parts.function.endsWith("(lambda)")) ? { selfIncludesSuper: true } : {}
     };
   }).sort((a, b) => b.selfMs - a.selfMs || b.totalMs - a.totalMs || a.function.localeCompare(b.function));
 }
@@ -33158,17 +33230,24 @@ function placedLambda(row, sourceOf) {
 }
 var CALL_SITES = 40;
 function callersOf(totals, name, scripts) {
-  const rows = rowsOf(totals);
+  const listed = [...scripts];
+  const sources = new Map(listed);
+  const rows = rowsOf(totals, (script) => sources.get(script) ?? null);
   const bare = bareName(name);
   const target = rows.filter((row) => name.includes(".") ? row.function === name : bareName(row.function) === bare);
   const sites = [];
-  for (const [script, source] of scripts) {
+  for (const [script, source] of listed) {
     for (const site of callSitesOf(source, bare)) {
       const within = site.within === null ? undefined : rows.find((row) => row.script === script && bareName(row.function) === site.within);
       sites.push({
         script,
         ...site,
-        ...within === undefined ? {} : { withinCalls: within.calls, withinSelfMs: within.selfMs, withinTotalMs: within.totalMs }
+        ...within === undefined ? {} : {
+          withinCalls: within.calls,
+          withinSelfMs: within.selfMs,
+          withinTotalMs: within.totalMs,
+          ...within.selfIncludesSuper === true ? { withinSelfIncludesSuper: true } : {}
+        }
       });
     }
   }
@@ -34199,7 +34278,7 @@ var TOOL_SPECS = [
       },
       wait: { summary: "wait for the run to end, then answer as editor_output does", requires: [] },
       profile: {
-        summary: "where the run spends its time by GDScript function, while it runs or after it ended: per function its script, the function (Class.name when the script declares a class_name), the line its body's first statement is on, for a lambda the named function it is written in (within), calls, and self and total milliseconds, sorted by self time, with functionsCounted, scriptMs (the self time of them all) and coveredMs. complete is true when the engine's own totals arrived, which it sends only when the profiler is switched off: the runtime addon does that as a game quits, so a scene that does its work in _ready and quits is covered whole; otherwise the answer is the frames summed so far and the note says what that misses. Self time counts a call into the engine's own methods as the caller's, and a function the profiler started inside is left out, since its time would be counted from the engine's start. The milliseconds are time passed while the function ran, not processor time given to it, so they grow when other processes compete for the processor: compare two profiles taken under the same load. A run started with profile: true is profiled from its start. A game the editor plays that was not is profiled from the moment this is asked, and the answer says so; a run this server started without it is refused, since its debugger is fixed as it starts",
+        summary: "where the run spends its time by GDScript function, while it runs or after it ended: per function its script, the function (Class.name when the script declares a class_name), the line its body's first statement is on, for a lambda the named function it is written in (within), calls, and self and total milliseconds, sorted by self time, with functionsCounted, scriptMs (the self time of them all) and coveredMs. complete is true when the engine's own totals arrived, which it sends only when the profiler is switched off: the runtime addon does that as a game quits, so a scene that does its work in _ready and quits is covered whole; otherwise the answer is the frames summed so far and the note says what that misses. Self time counts a call into the engine's own methods as the caller's, and a call through super too, while the overridden function's row counts it again: such a row carries selfIncludesSuper, so self times along an override chain overlap. A function the profiler started inside is left out, since its time would be counted from the engine's start. The milliseconds are time passed while the function ran, not processor time given to it, so they grow when other processes compete for the processor: compare two profiles taken under the same load. A run started with profile: true is profiled from its start. A game the editor plays that was not is profiled from the moment this is asked, and the answer says so; a run this server started without it is refused, since its debugger is fixed as it starts",
         requires: []
       }
     },
@@ -34828,10 +34907,15 @@ var FEEDBACK_NOTICE_EVERY = 250;
 var run4 = promisify5(execFile5);
 var __dirname2 = dirname15(fileURLToPath4(import.meta.url));
 function editorRestartTimeoutMs() {
-  const override = Number.parseInt(envValue("GDHARNESS_EDITOR_RESTART_TIMEOUT_MS") ?? "", 10);
-  return Number.isInteger(override) && override > 0 ? override : 90000;
+  return waitFromEnv("GDHARNESS_EDITOR_RESTART_TIMEOUT_MS", 90000);
+}
+function waitFromEnv(variable, fallback) {
+  const override = Number.parseInt(envValue(variable) ?? "", 10);
+  return Number.isInteger(override) && override > 0 ? override : fallback;
+}
+function greetingWaitMs() {
+  return waitFromEnv("GDHARNESS_GREETING_WAIT_MS", 1e4);
 }
-var GREETING_WAIT_MS = 1e4;
 function restartUnderway(note, now = Date.now()) {
   return alive(note.byPid) && now - Date.parse(note.quitAt) < editorRestartTimeoutMs() + 30000;
 }
@@ -34883,6 +34967,14 @@ function captureDetail(payload) {
 function patienceForFrames(frames, atLeast) {
   return Math.max(atLeast, frames / SLOWEST_FRAME_RATE * 1000 + atLeast);
 }
+function longerWaitNote(tool, op, waitedMs) {
+  const spec = TOOL_SPECS.find((one) => one.name === tool);
+  if (spec !== undefined && argumentsOf(spec, op).includes("timeoutMs")) {
+    return "timeoutMs waits longer next time.";
+  }
+  const how = tool === "runtime_wait" && op === "frames" ? `the wait is counted from the number of frames, at ${SLOWEST_FRAME_RATE} a second on top of GDHARNESS_RUNTIME_TIMEOUT_MS, and this game fell below that rate, so ask for fewer frames at a time` : "the wait is GDHARNESS_RUNTIME_TIMEOUT_MS, which is set in the environment the server is started with";
+  return `${tool} ${op} takes no timeoutMs: it was given ${waitedMs}ms, and ${how}.`;
+}
 function projectSpelling(projectPath, absolutePath) {
   return `res://${relative4(realPathOr(projectPath), realPathOr(absolutePath)).replaceAll("\\", "/")}`;
 }
@@ -34963,10 +35055,12 @@ function runIsUp(run, editorSays, editorPlay = null, now = Date.now()) {
 function noCodeWillCome(run) {
   return !exited(run);
 }
-var STOP_WAIT_MS = 1e4;
+function stopWaitMs() {
+  return waitFromEnv("GDHARNESS_STOP_WAIT_MS", 1e4);
+}
 var KEEPER_ANSWER_MS = 15000;
 var EXIT_REPORTED_WITHIN_MS = 2000;
-async function untilGone(pids, withinMs = STOP_WAIT_MS) {
+async function untilGone(pids, withinMs = stopWaitMs()) {
   const gone = () => pids.every((pid) => !alive(pid));
   const deadline = Date.now() + withinMs;
   while (!gone() && Date.now() < deadline) {
@@ -35021,7 +35115,7 @@ function stopVerdict(stop) {
     return {
       stopped: false,
       stillGoing: stop.endedPid,
-      note: `${told} ${STOP_WAIT_MS / 1000} seconds later, so it has not stopped. editor_status says when it has gone, and editor_run stop asks again.`,
+      note: `${told} ${stopWaitMs() / 1000} seconds later, so it has not stopped. editor_status says when it has gone, and editor_run stop asks again.`,
       withChildren: true
     };
   }
@@ -35140,7 +35234,7 @@ function endedToStartThis(ended) {
     return ` ${which} was not ended here: the editor could not be asked to stop it. The editor stops a play before starting the next, so it is not running beside this one if this start reached the editor.`;
   }
   if (ended.ending === "lingering") {
-    return ` ${which} was told to end to start this one and was still running ${STOP_WAIT_MS / 1000} seconds later, so it is running beside this one: editor_status says when it has gone.`;
+    return ` ${which} was told to end to start this one and was still running ${stopWaitMs() / 1000} seconds later, so it is running beside this one: editor_status says when it has gone.`;
   }
   return ` ${which} was ended to start this one; its output is no longer what editor_output answers about.`;
 }
@@ -35272,7 +35366,9 @@ var BOUNDARY_WAIT_MS = 2000;
 var HANDOVER_MS = SUCCESSOR_CHECK_MS + 5000;
 var HANDOVER_POLL_MS = 250;
 var CACHE_WRITE_MS = 2000;
-var SCAN_WAIT_MS = 30000;
+function scanWaitMs() {
+  return waitFromEnv("GDHARNESS_SCAN_WAIT_MS", 30000);
+}
 var STREAMS_GRACE_MS = 2000;
 function scanWaitIn(payload) {
   const waited = readNumber(payload, "waitedForEditorScanMs");
@@ -35332,7 +35428,7 @@ function scanWaitAnswer(scanned, started = "game") {
   if (scanned.waitedMs === 0) {
     return {};
   }
-  const still = `The editor was still scanning the project after ${SCAN_WAIT_MS / 1000} seconds, so`;
+  const still = `The editor was still scanning the project after ${scanWaitMs() / 1000} seconds, so`;
   return {
     waitedForEditorScanMs: scanned.waitedMs,
     scanNote: !scanned.stillScanning ? undefined : started === "game" ? `${still} this game started during the scan and may have read a class cache being rewritten. If ` + 'editor_output shows "Could not find type" for a class that is declared, editor_rescan ' + "waits for the scan to finish, and a start after it reads the finished cache." : `${still} the engine answering this started during the scan and may have read a class cache being ` + "rewritten, and a class cache it wrote can be written over when the scan finishes. If " + 'engine_messages shows "Could not find type" for a class that is declared, editor_rescan waits ' + "for the scan to finish, and the same call after it reads the finished cache."
@@ -35634,14 +35730,20 @@ function profileAnswer(reading, limit) {
   const table = profiledFunctions(totals, limit, reading.sourceOf);
   const notes = [];
   const addonNote = reading.runtimeAddon ? "" : " This project has no gdharness runtime addon, which switches the profiler off as the game quits so the engine sends its totals: setup installs it.";
-  if (totals.complete) {} else if (reading.running && totals.frames === 0) {
+  const totalsWithheld = reading.runtimeAddon ? " The runtime addon switches the profiler off as the game quits, and did not here: either it was no longer running in this game by then, which a project can arrange for some scenes; or the game ended without taking its tree down, as a crash or a kill does; or the totals did not reach the debugger before the game exited, which the game then says in its output." : addonNote;
+  if (totals.complete && reading.running) {
+    notes.push(`The engine's totals arrived while the game is still running, which it sends only when the profiler is switched off, so ${reading.through === "editor" ? "the editor's Profiler tab or the game itself, through EngineDebugger," : "the game itself, through EngineDebugger,"} switched it off before the game ended. They cover the run up to then and nothing after.`);
+  } else if (totals.complete) {} else if (reading.running && totals.frames === 0) {
     notes.push(`The profiler is on and the game has not finished its first frame yet: a frame is sent as it ends, so a scene doing its work in _ready shows nothing until that returns, and the engine's own totals arrive when the game quits.${addonNote}`);
   } else if (reading.running) {
     notes.push(`The run is still going, so these are the ${totals.frames === 1 ? "one frame" : `${totals.frames} frames`} summed so far${reading.through === "gdharness" ? ", written at most half a second behind" : ""}.`);
   } else if (totals.frames === 0) {
-    notes.push(`The game connected and ended before a frame of the profile reached ${reading.through === "editor" ? "the editor" : "this server"}: the engine sends its totals only when the profiler is switched off, and stops sending as it exits without emptying what it has queued.${addonNote}`);
+    notes.push(`The game connected and ended before a frame of the profile reached ${reading.through === "editor" ? "the editor" : "this server"}: the engine sends its totals only when the profiler is switched off, and stops sending as it exits without emptying what it has queued.${totalsWithheld}`);
   } else {
-    notes.push(`These are the ${totals.frames === 1 ? "one frame" : `${totals.frames} frames`} that arrived, summed, without the engine's own totals, so what the game did after the last of them is not in it: the engine sends its totals only when the profiler is switched off, and stops sending as it exits without emptying what it has queued.${addonNote}`);
+    notes.push(`These are the ${totals.frames === 1 ? "one frame" : `${totals.frames} frames`} that arrived, summed, without the engine's own totals, which it sends only when the profiler is switched off.${totalsWithheld} Not in them is any script time after the last frame sent: a frame still queued as the game exited, since the engine stops sending without emptying its queue, and what scripts did as it quit, such as in _exit_tree. That can be nothing: a scene that does its work in _ready and quits has all of it in its first frame.`);
+  }
+  if (table.superCallers > 0) {
+    notes.push(`${table.superCallers === 1 ? "One function calls" : `${table.superCallers} functions call`} through super, marked selfIncludesSuper: the engine takes every other call out of the caller's self time, and not a super call, so ${table.superCallers === 1 ? "its" : "their"} selfMs holds the overridden function's time, which that function's own row counts again. Self time therefore cannot be added along an override chain, and scriptMs counts the time under a super call once more for each level above it.`);
   }
   notes.push(...cappedNotes(totals));
   if (totals.unreadable > 0) {
@@ -36381,7 +36483,7 @@ class GodotServer {
   }
   async dispatch(tool, op, args) {
     if (tool !== "editor_status" && this.godotBridge.isArriving()) {
-      await this.waitForBridge(() => !this.godotBridge.isArriving(), Date.now() + GREETING_WAIT_MS);
+      await this.waitForBridge(() => !this.godotBridge.isArriving(), Date.now() + greetingWaitMs());
     }
     if (ENGINE_PASSES[tool]?.[op] !== undefined) {
       return op === "reimport" ? await this.handleReimport(args) : await this.handleRefreshUids(args);
@@ -36541,7 +36643,7 @@ class GodotServer {
               depth: depth ?? 3,
               include_properties: readBoolean(args, "includeProperties") ?? false,
               properties: readArray(args, "properties") ?? []
-            }, patience);
+            }, { tool: "runtime_inspect", op, patience });
           }
           case "find":
             return await this.handleFindRuntimeNodes(args, patience);
@@ -36551,17 +36653,17 @@ class GodotServer {
               root: readNonEmptyString(args, "nodePath") ?? "/root",
               include_hidden: readBoolean(args, "includeHidden") ?? false,
               limit: readPositiveNumber(args, "limit") ?? 500
-            }, patience);
+            }, { tool: "runtime_inspect", op, patience });
           case "rect":
-            return await this.handleRuntimeCommand("get_rect", { ...whichGame(args), path: readNonEmptyString(args, "nodePath") ?? "" }, patience);
+            return await this.handleRuntimeCommand("get_rect", { ...whichGame(args), path: readNonEmptyString(args, "nodePath") ?? "" }, { tool: "runtime_inspect", op, patience });
           case "property":
             return await this.handleRuntimeCommand("get_property", {
               ...whichGame(args),
               path: readNonEmptyString(args, "nodePath") ?? "",
               property: readNonEmptyString(args, "property") ?? ""
-            }, patience);
+            }, { tool: "runtime_inspect", op, patience });
           default:
-            return await this.handleRuntimeCommand("get_metrics", { ...whichGame(args), metrics: readArray(args, "metrics") ?? [] }, patience);
+            return await this.handleRuntimeCommand("get_metrics", { ...whichGame(args), metrics: readArray(args, "metrics") ?? [] }, { tool: "runtime_inspect", op, patience });
         }
       }
       case "runtime_invoke": {
@@ -36574,16 +36676,16 @@ class GodotServer {
           path: readNonEmptyString(args, "nodePath") ?? "",
           property: readString(args, "property") ?? "",
           value: args["value"]
-        }, patience) : await this.handleRuntimeCommand("call_method", {
+        }, { tool: "runtime_invoke", op, patience }) : await this.handleRuntimeCommand("call_method", {
           ...whichGame(args),
           path: readNonEmptyString(args, "nodePath") ?? "",
           method: readString(args, "method") ?? "",
           args: readArray(args, "args") ?? [],
           ...args["properties"] === undefined ? {} : { properties: args["properties"] }
-        }, patience);
+        }, { tool: "runtime_invoke", op, patience });
       }
       case "runtime_capture":
-        return await this.handleRuntimeCommand(op === "screenshot" ? "capture_screenshot" : "capture_viewport", args);
+        return await this.handleRuntimeCommand(op === "screenshot" ? "capture_screenshot" : "capture_viewport", args, { tool: "runtime_capture", op });
       case "runtime_input":
         if (op === "click") {
           if (readNonEmptyString(args, "nodePath") === undefined && readNonEmptyString(args, "says") === undefined) {
@@ -36596,7 +36698,7 @@ class GodotServer {
             double: readBoolean(args, "doubleClick") ?? false,
             ...readNonEmptyString(args, "says") === undefined ? {} : { says: readNonEmptyString(args, "says") },
             ...args["index"] === undefined ? {} : { index: args["index"] }
-          });
+          }, { tool: "runtime_input", op });
         }
         if (op === "choose") {
           return await this.handleRuntimeCommand("choose", {
@@ -36604,9 +36706,9 @@ class GodotServer {
             path: readNonEmptyString(args, "nodePath") ?? "",
             text: readString(args, "text") ?? "",
             ...args["index"] === undefined ? {} : { index: args["index"] }
-          });
+          }, { tool: "runtime_input", op });
         }
-        return await this.handleRuntimeCommand(`inject_${op}`, args);
+        return await this.handleRuntimeCommand(`inject_${op}`, args, { tool: "runtime_input", op });
       case "runtime_wait":
         return await this.handleRuntimeWait(op, args);
       case "debug_breakpoint": {
@@ -36835,7 +36937,7 @@ class GodotServer {
       const answered = Date.now();
       if (status["scanning"] === true || status["importing"] === true || status["pending"] === true) {
         sawAScan = true;
-        if (Date.now() - started >= SCAN_WAIT_MS) {
+        if (Date.now() - started >= scanWaitMs()) {
           return { waitedMs: Date.now() - started, stillScanning: true };
         }
         await new Promise((settle) => setTimeout(settle, 100));
@@ -38182,7 +38284,7 @@ class GodotServer {
       ]);
     }
     if (!hasSaidWhoItIs(before)) {
-      return this.createErrorResponse(`The editor has connected and has not said who it is within ${GREETING_WAIT_MS / 1000}s, so whether this server or the editor itself restarts it cannot be told.`, ["editor_status says when it has, under greeting while it has not", "Then ask for the restart again"]);
+      return this.createErrorResponse(`The editor has connected and has not said who it is within ${greetingWaitMs() / 1000}s, so whether this server or the editor itself restarts it cannot be told.`, ["editor_status says when it has, under greeting while it has not", "Then ask for the restart again"]);
     }
     const mine = before.openedByAServer === true && before.projectPath !== undefined;
     if (!mine && args["hidden"] === true) {
@@ -38797,7 +38899,7 @@ class GodotServer {
     game.brokeOn = halt.text;
     game.log.record("error", halt.text);
   }
-  async untilTheEditorStopsPlaying(withinMs = STOP_WAIT_MS) {
+  async untilTheEditorStopsPlaying(withinMs = stopWaitMs()) {
     const deadline = Date.now() + withinMs;
     for (;; ) {
       if ((await this.editorPlayingState())?.playing === false) {
@@ -38891,7 +38993,7 @@ class GodotServer {
       running.endedThrough = "signal";
     }
     clearTheRecord();
-    running.log.record(gone ? "info" : "warning", declined !== null ? `gdharness could not signal pid ${running.pid}: the operating system refused it (${declined}). It had described that process as ${described}.` : !gone ? `gdharness signalled pid ${running.pid}, which the operating system described as ${described}, and it was still running ${STOP_WAIT_MS / 1000} seconds later.` : 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}.`);
+    running.log.record(gone ? "info" : "warning", declined !== null ? `gdharness could not signal pid ${running.pid}: the operating system refused it (${declined}). It had described that process as ${described}.` : !gone ? `gdharness signalled pid ${running.pid}, which the operating system described as ${described}, and it was still running ${stopWaitMs() / 1000} seconds later.` : 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 ? "gone" : "lingering";
   }
   async endThroughTheKeeper(run, pid, keeper) {
@@ -38911,7 +39013,7 @@ class GodotServer {
       run.exitCode = null;
       run.exitSignal = "SIGTERM";
     }
-    run.log.record(gone ? "info" : "warning", !gone ? `gdharness had the keeper holding pid ${pid} end it, and it was still running ${STOP_WAIT_MS / 1000} seconds later.` : asked === "signalled" ? `gdharness ended pid ${pid} through the keeper holding it.` : `gdharness asked the keeper holding pid ${pid} to end it, and it had already gone.`);
+    run.log.record(gone ? "info" : "warning", !gone ? `gdharness had the keeper holding pid ${pid} end it, and it was still running ${stopWaitMs() / 1000} seconds later.` : asked === "signalled" ? `gdharness ended pid ${pid} through the keeper holding it.` : `gdharness asked the keeper holding pid ${pid} to end it, and it had already gone.`);
     return gone ? "gone" : "lingering";
   }
   spawnGame(godotPath, cmdArgs, env) {
@@ -39836,7 +39938,7 @@ class GodotServer {
       ...landed ? { endedThrough: "signal" } : {},
       ...childrenFields(ended),
       exitedBeforeStop: !landed,
-      note: `${!gone ? `pid ${pid} was told to end and was still running ${STOP_WAIT_MS / 1000} seconds later, so it has not stopped: a game of this project that no server here was holding,` : landed ? `pid ${pid} was ended: a game of this project that no server here was holding,` : `pid ${pid} had already gone when it was signalled: a game of this project that no server here was holding,`} identified by its announcement and by its command line, ${read.executable} run with --path ${read.projectPath ?? ""}. Nothing here read what it printed or holds its exit code, so neither is in this answer.${gone ? "" : " editor_status says when it has gone."} ${aboutTheChildren(ended, false)}`
+      note: `${!gone ? `pid ${pid} was told to end and was still running ${stopWaitMs() / 1000} seconds later, so it has not stopped: a game of this project that no server here was holding,` : landed ? `pid ${pid} was ended: a game of this project that no server here was holding,` : `pid ${pid} had already gone when it was signalled: a game of this project that no server here was holding,`} identified by its announcement and by its command line, ${read.executable} run with --path ${read.projectPath ?? ""}. Nothing here read what it printed or holds its exit code, so neither is in this answer.${gone ? "" : " editor_status says when it has gone."} ${aboutTheChildren(ended, false)}`
     });
   }
   async whatTheRunStarted(run) {
@@ -40572,7 +40674,8 @@ class GodotServer {
     }
     return `The game this server started (${which}) is still coming up and has not announced its runtime after a wait of ${Math.min(budgetMs, remaining)}ms, so there is nothing to talk to yet. It is still running: ask again in a moment rather than starting another.`;
   }
-  async handleRuntimeCommand(command, args, timeoutMs = this.runtimeTimeoutMs()) {
+  async handleRuntimeCommand(command, args, asked) {
+    const timeoutMs = asked.patience ?? this.runtimeTimeoutMs();
     const { op: _op, projectPath, pid, outputPath, ...params } = asParams(args);
     const waited = typeof pid === "number" ? null : await this.ownRunOnItsWay(typeof projectPath === "string" ? projectPath : this.ownProject, timeoutMs);
     if (waited !== null) {
@@ -40625,7 +40728,7 @@ ${staleNote}`);
           requestId: reply.requestId,
           command,
           waitedMs: timeoutMs,
-          note: reply.message,
+          note: `${reply.message} ${longerWaitNote(asked.tool, asked.op, timeoutMs)}`,
           ...answeredBy,
           ...stale
         });
@@ -40725,13 +40828,13 @@ ${staleNote}`}`
       limit: readPositiveNumber(args, "limit") ?? 100,
       ...property === undefined ? {} : { property },
       ...includeHidden === undefined ? {} : { include_hidden: includeHidden }
-    }, patience);
+    }, { tool: "runtime_inspect", op: "find", patience });
   }
   async handleRuntimeWait(op, args) {
     if (op === "frames") {
       const frames = readPositiveNumber(args, "frames") ?? 1;
       const waited = patienceForFrames(frames, this.runtimeTimeoutMs());
-      return await this.handleRuntimeCommand("wait_frames", { ...whichGame(args), frames }, waited);
+      return await this.handleRuntimeCommand("wait_frames", { ...whichGame(args), frames }, { tool: "runtime_wait", op, patience: waited });
     }
     const timeoutMs = readPositiveNumber(args, "timeoutMs") ?? 5000;
     const asked = readNonEmptyString(args, "nodePath");
@@ -40745,7 +40848,7 @@ ${staleNote}`}`
       path: nodePath,
       signal: readString(args, "signal") ?? "",
       timeout_ms: timeoutMs
-    }, patience) : await this.handleRuntimeCommand("wait_until", {
+    }, { tool: "runtime_wait", op, patience }) : await this.handleRuntimeCommand("wait_until", {
       ...whichGame(args),
       path: nodePath,
       property: readString(args, "property") ?? "",
@@ -40753,7 +40856,7 @@ ${staleNote}`}`
       ...readNonEmptyString(args, "says") === undefined ? {} : { says: readNonEmptyString(args, "says") },
       ...readBoolean(args, "includeHidden") === undefined ? {} : { include_hidden: readBoolean(args, "includeHidden") },
       timeout_ms: timeoutMs
-    }, patience);
+    }, { tool: "runtime_wait", op, patience });
   }
 }
 async function runGodotServer() {

package/build/keeper.js

@@ -550,6 +550,7 @@ var DECLARATION_LINE = new RegExp(`^(${ANNOTATIONS})(static\\s+)?(func|var|const
 var CLASS_NAME_LINE = new RegExp(`^${ANNOTATIONS}class_name\\s+(${NAME})`, "u");
 var EXTENDS_LINE = new RegExp(`^${ANNOTATIONS}(?:class_name\\s+${NAME}\\s+)?extends\\s`, "u");
 var FUNC_LINE = new RegExp(`^[ \\t]*${ANNOTATIONS}(?:static\\s+)?func\\s+(${NAME})\\s*\\(`, "u");
+var LAMBDA_HEADER = new RegExp(`(?<![\\p{L}\\p{N}_])func(?:\\s+${NAME})?\\s*\\(`, "u");
 var KEYWORDS = new Set([
   "and",
   "as",
@@ -7767,6 +7768,8 @@ function queuedMessagesOf(projectGodot) {
   const set = projectGodot === null ? undefined : parseProjectGodot(projectGodot)["network"]?.[QUEUE_SETTING];
   return typeof set === "number" && Number.isInteger(set) && set > 0 ? set : QUEUE_DEFAULT;
 }
+var PROFILE_SENT = "gdharness:profile_sent";
+var PROFILE_RECEIVED = "gdharness:profile_received";
 var UNNAMED_PREFIX = "#";
 function profilerOn(frameFunctions) {
   return framedCommand("profiler:servers", [true, [frameFunctions, false]]);
@@ -7931,6 +7934,9 @@ class ProfileListener {
         if ("message" in received && received.message === "debug_enter") {
           socket.write(framedCommand("continue", []));
         }
+        if ("message" in received && received.message === PROFILE_SENT) {
+          socket.write(framedCommand(PROFILE_RECEIVED, []));
+        }
         aggregate.take(received, Date.now());
         frames ||= "message" in received && (received.message === "servers:profile_frame" || received.message === "servers:profile_total");
       }

package/package.json

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