gdharness 1.3.57 → 1.3.58

package/build/cli.js

@@ -1763,6 +1763,9 @@ function nonEmpty(value) {
 function keptSlotsOf(count) {
   return Math.max(2, Math.floor(count / 4));
 }
+function reservedSlotOf(count) {
+  return count - Math.max(1, count - keptSlotsOf(count)) >= 2 ? count - 1 : null;
+}
 function gamesKeptOf(kept) {
   return Math.max(0, Math.min(Math.floor(kept / 2), kept - GATE_KEPT - 1));
 }
@@ -1777,7 +1780,8 @@ function slotsDrawnOn(count, taker, queue) {
     return { numbers: every };
   }
   if (taker === "tier") {
-    return { numbers: [...kept].reverse(), limit: "tier" };
+    const reserve = reservedSlotOf(count);
+    return { numbers: [...kept].reverse().filter((slot) => slot !== reserve), limit: "tier" };
   }
   return { numbers: kept.slice(0, Math.max(1, kept.length - GATE_KEPT)), limit: "kept" };
 }
@@ -1926,7 +1930,7 @@ class EngineSlots {
     try {
       for (;; ) {
         signal?.throwIfAborted();
-        const lock = await this.takeFree(game);
+        const lock = await this.takeFree(game, Date.now() - began);
         if (lock !== null) {
           return lock;
         }
@@ -1958,7 +1962,7 @@ class EngineSlots {
       }
     }
   }
-  async takeFree(game = false) {
+  async takeFree(game = false, waitedMs = 0) {
     mkdirSync2(this.directory, { recursive: true });
     await this.sweep();
     const inherited = this.inherited === null ? await this.inheritedLock() : null;
@@ -1967,11 +1971,14 @@ class EngineSlots {
       return inherited;
     }
     const taker = this.taker();
-    this.drawn = slotsDrawnOn(this.count, taker, taker === "gate" || taker === "timing" ? "none" : await this.gateQueue());
+    const aged = taker === "other" && !game && waitedMs >= ONE_OFF_AGED_MS;
+    this.drawn = slotsDrawnOn(this.count, taker, taker === "gate" || taker === "timing" || aged ? "none" : await this.gateQueue());
     if (game && this.drawn.limit === "kept") {
-      const share = slotsDrawnOn(this.count, "tier", "queued").numbers;
-      const games = await this.heldByGames(share);
-      if (games.length >= gamesKeptOf(share.length)) {
+      const reserve = reservedSlotOf(this.count);
+      this.drawn = { ...this.drawn, numbers: this.drawn.numbers.filter((slot) => slot !== reserve) };
+      const kept = this.count - Math.max(1, this.count - keptSlotsOf(this.count));
+      const games = await this.heldByGames(Array.from({ length: kept }, (_, at) => this.count - kept + at));
+      if (games.length >= gamesKeptOf(kept)) {
         this.drawn = { numbers: games, limit: "games" };
         return null;
       }
@@ -2122,6 +2129,25 @@ class EngineSlots {
         await this.cleared(join5(this.directory, name), false);
       }
     }
+    const marks = join5(this.directory, WAITING_FOLDER);
+    let waits;
+    try {
+      waits = readdirSync(marks);
+    } catch {
+      return;
+    }
+    for (const name of waits) {
+      let content;
+      try {
+        content = readWhole(join5(marks, name));
+      } catch {
+        continue;
+      }
+      const pid = content === null ? undefined : holderOf(content)?.pid;
+      if (pid !== undefined && !alive(pid)) {
+        removeWhole(join5(marks, name));
+      }
+    }
   }
   takenOver(lock, holder) {
     return this.cleared(lock, true, holder);
@@ -2344,7 +2370,7 @@ async function inASlot(body) {
     held.release();
   }
 }
-var HELD_VARIABLE = "GODOT_ENGINE_HELD", SLOTS_VARIABLE = "GODOT_ENGINE_SLOTS", SLOT_COUNT_VARIABLE = "GODOT_ENGINE_SLOT_COUNT", PROCESSORS_A_SLOT = 2, START_TOLERANCE_MS = 2000, UNWRITTEN_MS = 1e4, SLOT_LOOK_MS = 1000, SLOT_SETTLE_MS = 50, WAIT_SAID_MS = 20000, COMMAND_WAIT_SAID_MS = 2000, START_READ_MS = 1e4, WAITING_FOLDER = "waiting", QUEUED_FOLDER = "queued", SHARE_VARIABLE = "GODOT_ENGINE_SHARE", SHARE_COUNT_VARIABLE = "GODOT_ENGINE_SHARE_COUNT", GATE_KEPT = 1, TIMED_VARIABLE = "GODOT_ENGINE_TIMED", TIER_VARIABLE = "GODOT_ENGINE_TIER", SEATED_SUFFIX = ".seated", waitsMarked = 0, ENGINE_PID_LOOK_MS = 100, ours, saidTo, takenBy;
+var HELD_VARIABLE = "GODOT_ENGINE_HELD", SLOTS_VARIABLE = "GODOT_ENGINE_SLOTS", SLOT_COUNT_VARIABLE = "GODOT_ENGINE_SLOT_COUNT", PROCESSORS_A_SLOT = 2, START_TOLERANCE_MS = 2000, UNWRITTEN_MS = 1e4, SLOT_LOOK_MS = 1000, SLOT_SETTLE_MS = 50, WAIT_SAID_MS = 20000, COMMAND_WAIT_SAID_MS = 2000, START_READ_MS = 1e4, WAITING_FOLDER = "waiting", QUEUED_FOLDER = "queued", SHARE_VARIABLE = "GODOT_ENGINE_SHARE", SHARE_COUNT_VARIABLE = "GODOT_ENGINE_SHARE_COUNT", GATE_KEPT = 1, ONE_OFF_AGED_MS = 120000, TIMED_VARIABLE = "GODOT_ENGINE_TIMED", TIER_VARIABLE = "GODOT_ENGINE_TIER", SEATED_SUFFIX = ".seated", waitsMarked = 0, ENGINE_PID_LOOK_MS = 100, ours, saidTo, takenBy;
 var init_engine_slots = __esm(() => {
   init_alive();
   init_cache_home();
@@ -18158,7 +18184,7 @@ var init_tool_definitions = __esm(() => {
         direction: {
           type: "string",
           enum: ["forward", "reverse"],
-          description: "forward: what this resource loads or names. Each file named by its path carries kind, as reverse words it: ext_resource, extends, preload, load, include, or path for a path only written in a string, which the file itself may never load. Each reference closing a cycle is marked circular, with the cycle under circular_references. A script's dependencies include every script whose class_name it uses, marked by_class with the name, and the script of every autoload it names, marked by_autoload with the autoload's name. An ext_resource whose uid names another file than its path is followed to that file, as the engine loads it, with the path written under stale_path; one whose uid names no file the project has is followed by its path, as the engine does after warning, with the uid under unknown_uid; and a load or preload of a uid the project does not know is listed under that uid as missing. A shader's #include is followed as the preprocessor reads it, relative to the shader. A file the depth stops at carries beyond_depth, how many files it names that were not walked. A file's dependencies are listed at its first entry, and again further down only where the depth cut that list short and more is left; every other entry for a file naming any carries dependencies_listed_above. summary.total_resources is the file asked about, so 1; total_dependencies counts each file reached, directly or through another, once however many places load it; total_references counts the entries in the tree, and missing names every file referenced that does not exist, with the files referring to it. reverse: every file that refers to it and how, for a file that is gone as well while anything still refers to it, answered with exists: false (a missing file nothing refers to is refused, naming the nearest files), a scene instancing it, a script extending, preloading or loading it, and for a script with a class_name every use of that name, and for an autoload's script every use of the autoload's name, with autoload naming it. Each reference carries a kind: ext_resource, extends, preload, load, include or path for a reference by path, with stale_path when an ext_resource reaches it by its uid under another path, and unknown_uid when one names it by path beside a uid naming no file; setting, plugin, export_preset and import for one in project.godot, a plugin.cfg, export_presets.cfg or an import sidecar; class_name for a use of the declared name, the declaration itself being the script asked about; autoload for code naming the autoload. Three kinds are not uses: doc is a name inside a ## documentation comment, which renaming would break in the generated docs; comment is one in ordinary prose, which it would only make stale; and stale_path is an ext_resource naming it by a path the engine does not load, since its uid leads to the file under loads. summary.in_code is the count with those left out, which is the number to read when the question is whether anything still uses this. Default forward."
+          description: "forward: what this resource loads or names. Each file named by its path carries kind, as reverse words it: ext_resource, extends, preload, load, include, or path for a path only written in a string, which the file itself may never load. Each reference closing a cycle is marked circular, with the cycle under circular_references. A script's dependencies include every script whose class_name it uses, marked by_class with the name, and the script of every autoload it names, marked by_autoload with the autoload's name. An ext_resource whose uid names another file than its path is followed to that file, as the engine loads it, with the path written under stale_path; one whose uid names no file the project has is followed by its path, as the engine does after warning, with the uid under unknown_uid; and a load or preload of a uid the project does not know is listed under that uid as missing. A shader's #include is followed as the preprocessor reads it, relative to the shader. A file the depth stops at carries beyond_depth, how many files it names that were not walked. A file's dependencies are listed at its first entry, and again further down only where the depth cut that list short and more is left; every other entry for a file naming any carries dependencies_listed_above. summary.total_resources is the file asked about, so 1; total_dependencies counts each file reached, directly or through another, once however many places load it; total_references counts the entries in the tree, and missing names every file referenced that does not exist, with the files referring to it. reverse: every file that refers to it and how, for a file that is gone as well while anything still refers to it, answered with exists: false (a missing file nothing refers to is refused, naming the nearest files), a scene instancing it, a script extending, preloading or loading it, and for a script with a class_name every use of that name, and for an autoload's script every use of the autoload's name, with autoload naming it. Each reference carries a kind: ext_resource, extends, preload, load, include or path for a reference by path, with stale_path when an ext_resource reaches it by its uid under another path, and unknown_uid when one names it by path beside a uid naming no file; setting, plugin, export_preset and import for one in project.godot, a plugin.cfg, export_presets.cfg or an import sidecar; class_name for a use of the declared name, the declaration itself being the script asked about; autoload for code naming the autoload. Three kinds are not uses: doc is a name inside a ## documentation comment, which renaming would break in the generated docs; comment is one in ordinary prose, which it would only make stale; and stale_path is an ext_resource naming it by a path the engine does not load, since its uid leads to the file under loads. A file whose header, or an import sidecar, claims the same uid as its own is no use either: it is listed under shares_uid, since the engine maps a uid to one file and loads that one wherever the uid is named. summary.in_code is the count with those left out, which is the number to read when the question is whether anything still uses this. Default forward."
         },
         depth: {
           type: "integer",

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

@@ -16,8 +16,9 @@ const SETTLE_MS: int = 8000
 ## How long a window with nothing in it is walked before the client stops: a game building its tree
 ## fills the window within a few frames of being asked, and one building none never does.
 const EMPTY_MS: int = 4000
-## How long starting PowerShell and loading UI Automation may take before the client is stopped. It
-## waits on the machine alone: a warm start takes under a second, and a cold one on a loaded Windows
+## How long starting PowerShell, loading UI Automation and the client's other cold loads may take
+## before the client is stopped. It waits on the machine alone: a warm start takes under a second,
+## and a cold one on a loaded Windows
 ## runner took the whole of a single 23 s budget meant for the walk as well.
 const START_MS: int = 45000
 ## How long the walks may take beyond [constant SETTLE_MS] a window once UI Automation is loaded,
@@ -39,6 +40,7 @@ const NODE_ID: String = "_node_instance"
 const WALK: String = r"""
 $ErrorActionPreference = 'Stop'
 function Answer($value) {
+  Mark 'answering'
   [System.IO.File]::WriteAllText($Out, (ConvertTo-Json -InputObject $value -Depth 100 -Compress))
   Mark 'answered'
 }
@@ -48,7 +50,6 @@ function Mark($stage) {
 try {
   Mark 'began'
   Add-Type -AssemblyName UIAutomationClient, UIAutomationTypes
-  Mark 'loaded'
   $walker = [System.Windows.Automation.TreeWalker]::RawViewWalker
   function Patterned($element, $name) {
     $pattern = ("System.Windows.Automation.$($name)Pattern" -as [type])::Pattern
@@ -70,6 +71,10 @@ try {
   } catch {
     $script:unread = "$_"
   }
+  # Serialised once here, since the first ConvertTo-Json loads its serialiser, and on a loaded
+  # machine that cold load belongs to the start's budget, not to the walks'.
+  $null = ConvertTo-Json -InputObject @{ warm = @(1) } -Depth 100 -Compress
+  Mark 'loaded'
   function FullDescription($element) {
     if ($null -ne $script:unread) { return '' }
     try {
@@ -281,7 +286,9 @@ func get_accessibility(params: Dictionary) -> Dictionary:
 	var looked_at: int = began_at
 	while OS.is_process_running(pid):
 		var now: int = Time.get_ticks_msec()
-		if now - looked_at >= LOOK_MS:
+		# Read again at the deadline too, so an answer marked since the last look is taken rather
+		# than stopped.
+		if now - looked_at >= LOOK_MS or now > deadline:
 			looked_at = now
 			var marked: String = FileAccess.get_file_as_string(progress)
 			if not walking and marked.contains("loaded "):
@@ -756,8 +763,8 @@ static func _marks(progress: String) -> Array:
 
 ## How far a client started at [param started_ms] and stopped at [param stopped_ms] got by the marks
 ## in [param progress], said for a caller whose read it stopped: the time went to starting
-## PowerShell, loading UI Automation, the walks, or after the last walk, and which tells a loaded
-## machine from a window that never answers.
+## PowerShell, loading UI Automation, the walks, after the last walk, or writing the answer, and
+## which tells a loaded machine from a window that never answers.
 static func _reached(progress: String, started_ms: int, stopped_ms: int) -> String:
 	var marks: Array = _marks(progress)
 	var at: Dictionary = {}
@@ -786,7 +793,7 @@ static func _reached(progress: String, started_ms: int, stopped_ms: int) -> Stri
 			)
 			% [began, loaded]
 		)
-	return (
+	var walked: String = (
 		(
 			"PowerShell began the client after %d ms and loaded UI Automation in %d ms, and the "
 			+ "windows were walked %d time%s, the last finding %s element%s and ending %d ms "
@@ -802,6 +809,10 @@ static func _reached(progress: String, started_ms: int, stopped_ms: int) -> Stri
 			stopped_ms - last_at,
 		]
 	)
+	if not at.has("answering"):
+		return walked
+	var answering: int = stopped_ms - at["answering"]
+	return walked + ", which had been writing the answer for %d ms" % answering
 
 
 ## Where the time of a client started at [param started_ms] and done at [param done_ms] went, by

package/build/godot/operations/dependencies.gd

@@ -281,6 +281,8 @@ func find_resource_usages(params: Dictionary) -> Dictionary:
 	var by_kind: Dictionary = {}
 	var total: int = 0
 	var in_code: int = 0
+	var shares_uid: Array[String] = []
+	var target_uid: String = target["uid"]
 
 	for file_path: String in all_files:
 		# Its own sidecar names it as the file it was imported from, which is not a use of it.
@@ -305,6 +307,11 @@ func find_resource_usages(params: Dictionary) -> Dictionary:
 		var references: Array[Dictionary] = []
 		for i: int in range(lines.size()):
 			var line: String = lines[i]
+			# A file declaring the target's uid as its own is not using it: a resource copied with
+			# its header claims the same uid, and its header line was answered as a use by path.
+			if not target_uid.is_empty() and _own_uid(line, i, file_path) == target_uid:
+				shares_uid.append(file_path)
+				continue
 			var by_its_path: bool = _names_target(line, file_path, target)
 			var by_its_name: bool = false
 			var name_in_comment: bool = false
@@ -408,9 +415,30 @@ func find_resource_usages(params: Dictionary) -> Dictionary:
 	}
 	if not autoload_named.is_empty():
 		answer["autoload"] = autoload_named
+	if not shares_uid.is_empty():
+		answer["shares_uid"] = shares_uid
 	return answer
 
 
+# The uid [param line], line [param index] of [param file_path], declares as the file's own: a
+# scene's or a resource's header, or an import sidecar's uid of the file it imports; empty for any
+# other line.
+static func _own_uid(line: String, index: int, file_path: String) -> String:
+	var trimmed: String = line.strip_edges()
+	var declares: bool = (
+		(
+			index == 0
+			and file_path.get_extension() in ["tscn", "tres"]
+			and (trimmed.begins_with("[gd_scene") or trimmed.begins_with("[gd_resource"))
+		)
+		or (file_path.get_extension() == "import" and trimmed.begins_with('uid="'))
+	)
+	if not declares:
+		return ""
+	var found: RegExMatch = GdhPatterns.compiled('uid="(uid://[^"]+)"').search(trimmed)
+	return "" if found == null else found.get_string(1)
+
+
 # The class_name a script declares, or empty for a scene, a resource or a script without one.
 func _declared_class_name(path: String) -> String:
 	if not path.ends_with(".gd"):

package/package.json

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