gdharness 1.3.18 → 1.3.20

package/build/cli.js

@@ -11803,8 +11803,42 @@ function dictionary(entries) {
 
 // src/call-signal.ts
 import { AsyncLocalStorage } from "node:async_hooks";
-function withCallSignal(signal, answer, progress) {
-  return signal === undefined && progress === undefined ? answer() : current.run({ signal, progress: progress === undefined ? undefined : risingOnly(progress) }, answer);
+function stillGoingSaid(tool, op, elapsedMs) {
+  const seconds = Math.floor(elapsedMs / 1000);
+  const took = seconds < 60 ? `${seconds}s` : `${Math.floor(seconds / 60)}m ${seconds % 60}s`;
+  return `${op === null || op === "" ? tool : `${tool} ${op}`} is still going; ${took} in.`;
+}
+async function withCallSignal(signal, answer, progress, still) {
+  if (progress === undefined) {
+    return signal === undefined ? answer() : current.run({ signal, progress: undefined }, answer);
+  }
+  const began = Date.now();
+  const rising = risingOnly(progress);
+  let going = still;
+  let quiet;
+  const rearm = () => {
+    clearTimeout(quiet);
+    if (going === undefined) {
+      return;
+    }
+    const { everyMs, said } = going;
+    quiet = setTimeout(() => {
+      const elapsed = Date.now() - began;
+      told(Math.floor(elapsed / 1000), said(elapsed));
+    }, everyMs);
+    quiet.unref();
+  };
+  const told = (number, message) => {
+    rising(number, message);
+    rearm();
+  };
+  rearm();
+  try {
+    return await current.run({ signal, progress: told }, answer);
+  } finally {
+    going = undefined;
+    clearTimeout(quiet);
+  }
 }
 function risingOnly(progress) {
   let last = Number.NEGATIVE_INFINITY;
@@ -11819,7 +11853,7 @@ function callSignal() {
 function callProgress() {
   return current.getStore()?.progress;
 }
-var current;
+var current, CALL_HEARTBEAT_MS = 20000;
 var init_call_signal = __esm(() => {
   current = new AsyncLocalStorage;
 });
@@ -48344,14 +48378,14 @@ var init_suites_scene = __esm(() => {
 });
 
 // src/test-selection.ts
-import { existsSync as existsSync33, readFileSync as readFileSync36 } from "node:fs";
+import { existsSync as existsSync33 } from "node:fs";
 import { basename as basename12, join as join42 } from "node:path";
-function casesIn(projectPath, suite) {
-  const text = readFileSync36(join42(projectPath, suite.slice("res://".length)), "utf8");
-  return [...text.matchAll(/^func\s+(test_\w*)\s*\(/gm)].map((match) => match[1] ?? "");
+function casesIn(scripts, suite) {
+  return scripts.suite(suite)?.cases ?? scripts.script(suite)?.funcs.filter((name) => name.startsWith("test_")) ?? [];
 }
 function scriptsWithoutCases(projectPath, asked) {
-  return asked.filter((path) => path.endsWith(".gd") && existsSync33(join42(projectPath, path.slice("res://".length))) && casesIn(projectPath, path).length === 0);
+  const scripts = new ProjectScripts(projectPath);
+  return asked.filter((path) => path.endsWith(".gd") && existsSync33(join42(projectPath, path.slice("res://".length))) && casesIn(scripts, path).length === 0);
 }
 function suitesUnder(projectPath, asked) {
   const scripts = projectFiles(projectPath, [".gd"]).map((path) => `res://${path}`);
@@ -48367,7 +48401,8 @@ function selectTests(projectPath, asked, given) {
   if (entries.length === 0) {
     return { ok: false, reason: "tests is an empty list: name a case, or leave tests out to run every one." };
   }
-  const declared = suitesUnder(projectPath, asked).flatMap((suite) => casesIn(projectPath, suite).map((test) => ({ suite, test })));
+  const scripts = new ProjectScripts(projectPath);
+  const declared = suitesUnder(projectPath, asked).flatMap((suite) => casesIn(scripts, suite).map((test) => ({ suite, test })));
   const nameOf = (suite) => basename12(suite, ".gd");
   const selected = [];
   for (const [index, entry] of entries.entries()) {
@@ -48408,6 +48443,7 @@ function selectTests(projectPath, asked, given) {
 }
 var init_test_selection = __esm(() => {
   init_project_scan();
+  init_suite_plan();
 });
 
 // src/server.ts
@@ -48422,7 +48458,7 @@ import {
   mkdirSync as mkdirSync23,
   openSync as openSync6,
   readdirSync as readdirSync19,
-  readFileSync as readFileSync37,
+  readFileSync as readFileSync36,
   readSync as readSync3,
   realpathSync as realpathSync5,
   rmdirSync as rmdirSync2,
@@ -48443,9 +48479,9 @@ function greetingWaitMs() {
   return waitFromEnv("GDHARNESS_GREETING_WAIT_MS", 1e4);
 }
 function pictureToSend(pngPath, jpegPath) {
-  const png = readFileSync37(pngPath);
+  const png = readFileSync36(pngPath);
   const beside = pngPath.replace(/\.png$/, ".jpg");
-  const jpeg = jpegPath !== undefined && normalize2(jpegPath) === normalize2(beside) && existsSync34(beside) ? readFileSync37(beside) : null;
+  const jpeg = jpegPath !== undefined && normalize2(jpegPath) === normalize2(beside) && existsSync34(beside) ? readFileSync36(beside) : null;
   const sent = jpeg !== null && jpeg.length < png.length ? jpeg : png;
   return {
     data: sent.toString("base64"),
@@ -48924,7 +48960,7 @@ function endedToStartThis(ended) {
   return ` ${which} was ended to start this one; its output is no longer what editor_output answers about.`;
 }
 function lineNothingStopsOn(absolutePath, relativePath, line) {
-  const text = readFileSync37(absolutePath, "utf8");
+  const text = readFileSync36(absolutePath, "utf8");
   const lines = text === "" ? 0 : text.split(`
 `).length - (text.endsWith(`
 `) ? 1 : 0);
@@ -49135,7 +49171,7 @@ function notRunNote(notRun, failFast) {
 function presetsIn(projectPath) {
   let text;
   try {
-    text = readFileSync37(join43(projectPath, "export_presets.cfg"), "utf8");
+    text = readFileSync36(join43(projectPath, "export_presets.cfg"), "utf8");
   } catch {
     return null;
   }
@@ -49285,7 +49321,7 @@ function rewriteBusNamed(projectPath, from, to) {
   const rewritten = [];
   for (const file of projectFiles(projectPath, [".tscn", ".tres"])) {
     const absolute = join43(projectPath, file);
-    const lines = readFileSync37(absolute, "utf8").split(`
+    const lines = readFileSync36(absolute, "utf8").split(`
 `);
     const at = [];
     const after = lines.map((line, index) => {
@@ -49304,7 +49340,7 @@ function rewriteBusNamed(projectPath, from, to) {
   }
   const namedInScripts = [];
   for (const file of projectFiles(projectPath, [".gd"])) {
-    readFileSync37(join43(projectPath, file), "utf8").split(`
+    readFileSync36(join43(projectPath, file), "utf8").split(`
 `).forEach((line, index) => {
       if (line.includes(`"${from}"`)) {
         namedInScripts.push({ file: `res://${file}`, line: index + 1, text: line.trim() });
@@ -49579,7 +49615,7 @@ function profileFrameFunctions(projectPath) {
   let projectGodot = null;
   if (projectPath !== null) {
     try {
-      projectGodot = readFileSync37(join43(projectPath, "project.godot"), "utf8");
+      projectGodot = readFileSync36(join43(projectPath, "project.godot"), "utf8");
     } catch {}
   }
   return frameFunctionsFor(queuedMessagesOf(projectGodot));
@@ -49603,7 +49639,7 @@ function projectSourceOf(projectPath) {
       let source = null;
       if (inside.ok) {
         try {
-          source = readFileSync37(inside.absolutePath, "utf8");
+          source = readFileSync36(inside.absolutePath, "utf8");
         } catch {}
       }
       read.set(script, source);
@@ -49762,7 +49798,7 @@ function foldedEntriesAnswer(log, floor = "warning") {
 }
 function gdUnitFailsOnScriptErrors(projectPath) {
   try {
-    return settingKeys(readFileSync37(join43(projectPath, "project.godot"), "utf8")).get("gdunit4/report/godot/script_error") !== false;
+    return settingKeys(readFileSync36(join43(projectPath, "project.godot"), "utf8")).get("gdunit4/report/godot/script_error") !== false;
   } catch {
     return true;
   }
@@ -49890,11 +49926,11 @@ function isDirectory(path) {
   }
 }
 function mainSceneOf(projectFile) {
-  const scene = parseProjectGodot(readFileSync37(projectFile, "utf8"))["application"]?.["run/main_scene"];
+  const scene = parseProjectGodot(readFileSync36(projectFile, "utf8"))["application"]?.["run/main_scene"];
   return typeof scene === "string" && scene !== "" ? scene : null;
 }
 function editorPlaysHeadless(projectFile) {
-  const runArgs = parseProjectGodot(readFileSync37(projectFile, "utf8"))["editor"]?.["run/main_run_args"];
+  const runArgs = parseProjectGodot(readFileSync36(projectFile, "utf8"))["editor"]?.["run/main_run_args"];
   return typeof runArgs === "string" && /(?:^|\s)--headless(?:\s|$)/.test(runArgs);
 }
 function ownArguments(params) {
@@ -50347,7 +50383,10 @@ class GodotServer {
       const call = this.callsTaken++;
       this.inFlight.set(call, { tool: spec.name, op: checked.op ?? "", startedAt: Date.now() });
       try {
-        const answer = await withCallSignal(ctx.mcpReq.signal, () => this.answered(spec.name, checked.op ?? "", args), progress);
+        const answer = await withCallSignal(ctx.mcpReq.signal, () => this.answered(spec.name, checked.op ?? "", args), progress, {
+          everyMs: CALL_HEARTBEAT_MS,
+          said: (elapsedMs) => stillGoingSaid(spec.name, checked.op, elapsedMs)
+        });
         return this.withinTheClientsLimit(spec.name, this.withFeedbackNotice(this.withUpdateNotice(answer)));
       } finally {
         this.inFlight.delete(call);
@@ -51786,7 +51825,7 @@ class GodotServer {
     if (!engine.ok) {
       return engine.response;
     }
-    const application = parseProjectGodot(readFileSync37(project.value.file, "utf8"))["application"] ?? {};
+    const application = parseProjectGodot(readFileSync36(project.value.file, "utf8"))["application"] ?? {};
     const name = application["config/name"];
     const mainScene = application["run/main_scene"];
     const info = {
@@ -52306,13 +52345,13 @@ ${platform}`;
     const reportsDir = join43(project.value.path, ".godot", ...ours.split("/"));
     let report = null;
     let reportProblem = null;
-    const casePrinted = withNestedErrors(readRun(existsSync34(engineLog) ? readFileSync37(engineLog, "utf8") : ""), run.log.all);
+    const casePrinted = withNestedErrors(readRun(existsSync34(engineLog) ? readFileSync36(engineLog, "utf8") : ""), run.log.all);
     const declaredErrors = readExpected(expectedFile);
     try {
       const written = existsSync34(reportsDir) && notCompiled === null ? readdirSync19(reportsDir).filter((name) => name.startsWith("report_")).sort((a, b) => Number(a.slice("report_".length)) - Number(b.slice("report_".length))) : [];
       const newest = written.at(-1);
       if (newest !== undefined) {
-        report = parseJUnit(readFileSync37(join43(reportsDir, newest, "results.xml"), "utf8"));
+        report = parseJUnit(readFileSync36(join43(reportsDir, newest, "results.xml"), "utf8"));
       }
     } catch (error) {
       reportProblem = errorMessage(error);
@@ -52791,7 +52830,7 @@ ${error.text}`;
         return null;
       }
       try {
-        return readFileSync37(contained.absolutePath, "utf8");
+        return readFileSync36(contained.absolutePath, "utf8");
       } catch {
         return null;
       }
@@ -52885,7 +52924,7 @@ ${error.text}`;
       return null;
     }
     try {
-      return readFileSync37(contained.absolutePath, "utf8");
+      return readFileSync36(contained.absolutePath, "utf8");
     } catch {
       return null;
     }
@@ -53388,7 +53427,7 @@ ${error.text}`;
       return null;
     }
     try {
-      return settingKeys(readFileSync37(join43(projectPath, "project.godot"), "utf8"));
+      return settingKeys(readFileSync36(join43(projectPath, "project.godot"), "utf8"));
     } catch {
       return null;
     }
@@ -54168,7 +54207,7 @@ ${error.text}`;
       return 0;
     }
     try {
-      return reportAlreadyInTranscript(readFileSync37(game.transcript), readFileSync37(report));
+      return reportAlreadyInTranscript(readFileSync36(game.transcript), readFileSync36(report));
     } catch (error) {
       this.logDebug(`Could not compare a picked-up run's report with its transcript: ${errorMessage(error)}`);
       return 0;
@@ -56501,7 +56540,7 @@ ${error.text}`;
     }
     const escaped = symbol.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const declared = new RegExp(`^\\s*(?:@\\w+(?:\\([^)]*\\))?\\s+)*class_name\\s+${escaped}\\b`, "m");
-    if (declared.test(readFileSync37(scriptPath, "utf8"))) {
+    if (declared.test(readFileSync36(scriptPath, "utf8"))) {
       return null;
     }
     const checked = await this.classesTheEditorCannotSee(args);

package/build/godot/tests/listed.gd

@@ -80,6 +80,11 @@ class GdhRunner:
 	var together: GDScript = null
 	## The cases dealt by their rows, by `res://suite.gd:test_case`.
 	var row_shares: Dictionary[String, GdhRowShare] = {}
+	## The cases to leave out, by `res://suite.gd:test_case` of the suite running them. gdUnit4's own
+	## list is matched against the script declaring a case, which for a case a suite inherits is its
+	## base, so an inherited case left out under its suite ran in every engine the suite was dealt to,
+	## and a case of `res://tests/a_test.gd` was also left out of `res://more/tests/a_test.gd`.
+	var left_out: Dictionary[String, bool] = {}
 	## The cases gdUnit4 said it finished, which [GdhSessionCheck] holds the session's lookups against.
 	var cases_ended: int = 0
 	## The marker of the shutdown walk's oldest end, made as the run starts.
@@ -106,10 +111,40 @@ class GdhRunner:
 			return options
 		return options_of(OS.get_cmdline_args(), own_path)
 
+	## gdUnit4's own discovery, with each case filed under the suite it was found in before it is
+	## asked whether to leave the case out. gdUnit4 files a case under the script declaring it, which
+	## for a case a suite inherits is its base: its reports added such a case to no suite, so
+	## project_test counted none of them, and a parameterised one ran as a suite of the base's own,
+	## outside the suite inheriting it and its hooks, and was judged a case that suite never ran.
+	func discover_tests() -> Array[GdUnitTestCase]:
+		var added: Signal = GdUnitSignals.instance().gdunit_test_discover_added
+		_test_cases = _runner_config.test_cases()
+		var scanner: GdUnitTestSuiteScanner = GdUnitTestSuiteScanner.new()
+		for path: String in _included_tests:
+			for script: Script in scanner.scan(path):
+				var suite: String = script.resource_path
+				var found: Callable = func(test: GdUnitTestCase) -> void:
+					filed_under(test, suite)
+					if not is_skipped(test):
+						_test_cases.append(test)
+						added.emit(test)
+				GdUnitTestDiscoverer.discover_tests(script, found)
+		return _test_cases
+
+	## [param test] as a case of the suite at [param suite], under which gdUnit4 groups, reports and
+	## leaves out its cases.
+	static func filed_under(test: GdUnitTestCase, suite: String) -> void:
+		if test.suite_resource_path == suite and test.source_file == suite:
+			return
+		test.suite_resource_path = suite
+		test.source_file = suite
+		test.suite_name = suite.get_file().get_basename()
+		test._build_fully_qualified_name(suite)
+
 	## gdUnit4 asks this of every case it finds, a parameterised case once a row, each row carrying
 	## its index.
 	func is_skipped(test: GdUnitTestCase) -> bool:
-		if super(test):
+		if left_out.has("%s:%s" % [test.suite_resource_path, test.test_name]) or super(test):
 			return true
 		var share: GdhRowShare = row_shares.get("%s:%s" % [test.suite_resource_path, test.test_name], null)
 		if share == null or not share.leaves_out(test.attribute_index):
@@ -348,7 +383,11 @@ static func started(given: PackedStringArray) -> GdhRunner:
 	if not expected_out.is_empty():
 		write_expected(expected_out, suites)
 	runner.add_test_suites(suites)
-	runner.skip_test_suites(listed(asked, SKIPPING))
+	for entry: String in listed(asked, SKIPPING):
+		if is_one_case(entry):
+			runner.left_out[entry] = true
+		else:
+			runner.skip_test_suite(entry)
 	runner.row_shares = row_shares_of(listed(asked, ROWS))
 	# Added to the list itself rather than through `register`, which saves every hook it holds into
 	# `project.godot`.
@@ -426,6 +465,19 @@ static func listed(args: PackedStringArray, flag: String) -> PackedStringArray:
 	return named
 
 
+## Whether [param entry] of a [constant SKIPPING] file names one case of one suite file, as
+## `res://suite.gd:test_case`, rather than a suite or a case by gdUnit4's looser names, which go to
+## gdUnit4 as they are.
+static func is_one_case(entry: String) -> bool:
+	var at: int = entry.rfind(":")
+	return (
+		entry.begins_with("res://")
+		and at > "res://".length()
+		and entry.substr(0, at).ends_with(".gd")
+		and entry.substr(at + 1).is_valid_ascii_identifier()
+	)
+
+
 ## The row shares [param lines] of a [constant ROWS] file give, by case.
 static func row_shares_of(lines: PackedStringArray) -> Dictionary[String, GdhRowShare]:
 	var shares: Dictionary[String, GdhRowShare] = {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdharness",
-  "version": "1.3.18",
+  "version": "1.3.20",
   "mcpName": "io.github.Aureliolo/gdharness",
   "description": "A harness for driving a Godot 4 project from an agent: editor addons, a runtime bridge into the running game, an MCP server in front of them, and a CLI that installs and diagnoses the Godot side.",
   "type": "module",