gdharness 1.0.31 → 1.1.0

package/build/cli.js

@@ -16546,7 +16546,7 @@ var init_tool_definitions = __esm(() => {
         says: {
           type: "string",
           ops: ["find"],
-          description: "find: part of what the node has written on it as drawn, the way the text op reads it, case-insensitively, which is how a button is reached by the word on it rather than by a generated path. Its own text, so a row is found by the label in it, and hidden nodes match. A bare word is a contains; write a glob and it is one, matched against the whole of what the node says, the same as namePattern. A label with a line break is matched with the break in the words, and a backslash followed by n counts as one."
+          description: "find: part of what the node has written on it as drawn, the way the text op reads it, case-insensitively, which is how a button is reached by the word on it rather than by a generated path. Its own text, so a row is found by the label in it, and hidden nodes match. A bare word is a contains; write a glob and it is one, matched against the whole of what the node says, the same as namePattern, and a glob that finds nothing says under note how many nodes it would find open at both ends. A label with a line break is matched with the break in the words, and a backslash followed by n counts as one."
         },
         limit: {
           type: "integer",
@@ -16575,7 +16575,7 @@ var init_tool_definitions = __esm(() => {
       operations: {
         tree: { summary: "the live scene tree", requires: [] },
         text: {
-          summary: "every line of text under nodePath, the values in its fields included, in the order somebody reads the screen, leaving out what is hidden and everything under it. Every line reads as drawn: rich text without its tags, text only as far as it has been typed out, a translation rather than its key, an upper-case label in capitals and a secret field as its mask. Tab titles, menu bar titles, list items, a tree's column titles and rows, and an open menu's items read a line each",
+          summary: "every line of text under nodePath, the values in its fields included, in the order somebody reads the screen, leaving out what is hidden and everything under it. Every line reads as drawn: rich text without its tags, text only as far as it has been typed out, a translation rather than its key, an upper-case label in capitals and a secret field as its mask. Tab titles, menu bar titles, list items, a tree's column titles and rows, and an open menu's items and the titles of its separators read a line each",
           requires: []
         },
         find: {
@@ -16596,7 +16596,7 @@ var init_tool_definitions = __esm(() => {
     },
     {
       name: "runtime_invoke",
-      description: "Sets a property or calls a method on a node in the running game. Needs the game running with the runtime addon. A call that takes longer than timeoutMs is not cancelled: the answer is pending: true with a requestId, the call goes on and does everything it was asked, and op result with that requestId collects its reply once it comes.",
+      description: "Sets a property or calls a method on a node in the running game. Needs the game running with the runtime addon. The answer carries elapsed_usec, how long the call or the write took inside the game, measured around it there: the round trip to the game is a second or more, so timing from outside measures that instead. A call that takes longer than timeoutMs is not cancelled: the answer is pending: true with a requestId, the call goes on and does everything it was asked, and op result with that requestId collects its reply once it comes.",
       parameters: {
         projectPath: RUNNING_PROJECT_PATH,
         pid: RUNNING_PID,

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

@@ -664,7 +664,19 @@ func choose(params: Dictionary) -> Dictionary:
 			"message": "%s has no such item. It holds: %s" % [node_path, ", ".join(_items_of(menu))]
 		}
 	if menu.is_item_separator(index):
-		return {"type": "error", "message": "%s item %d is a separator, not a choice" % [node_path, index]}
+		var heading: String = Words.item_says(menu, index).strip_edges()
+		return {
+			"type": "error",
+			"message":
+			(
+				"%s item %d is a separator, not a choice" % [node_path, index]
+				if heading.is_empty()
+				else (
+					"%s item %d, %s, is a separator heading the items below it, not a choice"
+					% [node_path, index, heading]
+				)
+			)
+		}
 	if menu.is_item_disabled(index):
 		return {
 			"type": "error",
@@ -732,26 +744,39 @@ static func _wanted_item(menu: PopupMenu, params: Dictionary) -> int:
 	var wanted: String = str(params.get("text", ""))
 	if wanted.is_empty():
 		return -1
+	# The items before the separators, because a heading can carry the same words as an item under
+	# it, and finding the heading first refused the choice the caller meant. A separator is still
+	# looked for after, so a heading asked for by name is refused as one rather than as missing.
+	var order: Array[int] = []
+	for separators: bool in [false, true]:
+		for index: int in menu.get_item_count():
+			if menu.is_item_separator(index) == separators:
+				order.append(index)
 	var shown: Array[String] = []
 	var held: Array[String] = []
-	for index: int in menu.get_item_count():
+	for index: int in order:
 		shown.append(Words.item_says(menu, index))
 		held.append(menu.get_item_text(index))
 	for words: Array[String] in [shown, held]:
-		for index: int in words.size():
-			if words[index] == wanted:
-				return index
-		for index: int in words.size():
-			if words[index].nocasecmp_to(wanted) == 0:
-				return index
+		for at: int in words.size():
+			if words[at] == wanted:
+				return order[at]
+		for at: int in words.size():
+			if words[at].nocasecmp_to(wanted) == 0:
+				return order[at]
 	return -1
 
 
-## What the menu shows, for a refusal that names the choices rather than the miss.
+## What the menu shows, for a refusal that names the choices rather than the miss: a titled
+## separator marked as the heading it is, and one with no title left out, since it shows nothing.
 static func _items_of(menu: PopupMenu) -> Array[String]:
 	var said: Array[String] = []
 	for index: int in menu.get_item_count():
-		said.append("%d: %s" % [index, Words.item_says(menu, index)])
+		var words: String = Words.item_says(menu, index)
+		if not menu.is_item_separator(index):
+			said.append("%d: %s" % [index, words])
+		elif not words.strip_edges().is_empty():
+			said.append("%d: %s (a heading)" % [index, words])
 	return said
 
 

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

@@ -104,6 +104,15 @@ func find_nodes(params: Dictionary) -> Dictionary:
 	# find would have matched if the name had been read the way it was probably meant.
 	var literal: bool = _is_literal(wanted["name"])
 	var nearly: int = 0
+	# The same for the words: a glob is matched against the whole text, and one written as a prefix
+	# by habit, "Taken together*", missed the label whose sentence those words are in the middle of.
+	# Nothing found then read as the words not being on screen, which is the wrong conclusion when
+	# checking that a change to the text landed.
+	var widened_says: String = _widened(wanted["says"])
+	var widened: Dictionary[String, String] = {}
+	for filter: String in wanted:
+		widened[filter] = widened_says if filter == "says" else wanted[filter]
+	var nearly_said: int = 0
 	var hidden: int = 0
 	while not pending.is_empty():
 		var node: Node = pending.pop_front()
@@ -118,6 +127,12 @@ func find_nodes(params: Dictionary) -> Dictionary:
 				found.append(_found(node, wanted_property))
 		elif rest and literal and str(node.name).containsn(wanted["name"]):
 			nearly += 1
+		elif (
+			not widened_says.is_empty()
+			and _named(node, wanted["name"])
+			and _matches_apart_from_name(node, widened)
+		):
+			nearly_said += 1
 		# Internal children included, which they were not. A ConfirmationDialog builds its Yes and
 		# its No as internal nodes, and a ScrollContainer its bars, so a find over a screen for
 		# every Button came back without the two buttons the player is being asked to press:
@@ -141,6 +156,16 @@ func find_nodes(params: Dictionary) -> Dictionary:
 				% [nearly, holding, wanted["name"], wanted["name"]]
 			)
 		)
+	if found.is_empty() and nearly_said > 0:
+		(
+			notes
+			. append(
+				(
+					'says with a wildcard is matched as a glob against a node\'s whole text; "%s" would find %d node%s'
+					% [widened_says, nearly_said, "" if nearly_said == 1 else "s"]
+				)
+			)
+		)
 	# How many the filter took out, so a short answer is not read as a small screen. Left out
 	# entirely when nothing was hidden, which keeps a plain answer plain.
 	if hidden > 0:
@@ -234,6 +259,15 @@ static func _says(said: String, wanted: String) -> bool:
 	return said.containsn(words) if _is_literal(words) else said.matchn(words)
 
 
+## [param wanted], a glob, open at both ends so it matches its words anywhere in a text; "" when
+## it is not a glob, or already open at both ends, and so has nothing to suggest.
+static func _widened(wanted: String) -> String:
+	if wanted.is_empty() or _is_literal(wanted):
+		return ""
+	var open: String = "*" + wanted.lstrip("*").rstrip("*") + "*"
+	return "" if open == wanted else open
+
+
 ## [param wanted] as words on a screen: a backslash followed by n is a line break.
 ##
 ## A button with two lines on it was asked for with the break written as the two characters, the
@@ -624,7 +658,10 @@ func set_property(params: Dictionary) -> Dictionary:
 				"%s.%s is a typed %s: %s." % [reached["called"], named, _sort_of(old_value), typed["message"]]
 			}
 		given = typed["value"]
+	# The write alone, setter included, which is where a property's cost is.
+	var began: int = Time.get_ticks_usec()
 	Paths.write(holder, named, given)
+	var elapsed: int = Time.get_ticks_usec() - began
 	var now: Variant = Paths.read_under(holder, named)
 	# Read back rather than trusted. The engine drops a write it will not take without a word, and
 	# the answer then showed the old value as the new one, shaped as a success: a typed container
@@ -658,7 +695,8 @@ func set_property(params: Dictionary) -> Dictionary:
 		"path": node_path,
 		"property": property,
 		"old_value": _values.serialize(old_value),
-		"new_value": _values.serialize(now)
+		"new_value": _values.serialize(now),
+		"elapsed_usec": elapsed
 	}
 
 
@@ -695,12 +733,15 @@ func call_method(params: Dictionary) -> Dictionary:
 		if Paths.method_of(spelled).is_empty():
 			spelled += "()"
 		if args.is_empty() and Paths.can_read(reached["holder"], spelled):
+			var read_from: int = Time.get_ticks_usec()
 			var answered: Variant = Paths.read_under(reached["holder"], spelled)
+			var read_for: int = Time.get_ticks_usec() - read_from
 			return {
 				"type": "method_result",
 				"path": node_path,
 				"method": method,
 				"result": _values.serialize(answered),
+				"elapsed_usec": read_for,
 			}
 		var why: String = (
 			"%s:%s takes no arguments" % [reached["called"], spelled]
@@ -772,9 +813,19 @@ func call_method(params: Dictionary) -> Dictionary:
 			given = typed["value"]
 		deserialized_args.append(given)
 
+	# Timed around the call alone, since the bridge's round trip is a second or more and swamps what
+	# one click's work costs; the frame metrics read whichever frame is last, which is not this one.
+	var began: int = Time.get_ticks_usec()
 	var result: Variant = holder.callv(named, deserialized_args)
+	var elapsed: int = Time.get_ticks_usec() - began
 
-	return {"type": "method_result", "path": node_path, "method": method, "result": _values.serialize(result)}
+	return {
+		"type": "method_result",
+		"path": node_path,
+		"method": method,
+		"result": _values.serialize(result),
+		"elapsed_usec": elapsed
+	}
 
 
 ## [method _object_named] with the path first, which is the order [method Values.typed_like] calls

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

@@ -49,10 +49,11 @@ static func lines_said_by(node: Node) -> Array[String]:
 		for item: int in list.item_count:
 			_keep(_as_drawn(node, list.get_item_text(item), list.get_item_auto_translate_mode(item)), lines)
 	elif node is PopupMenu:
+		# A separator too, by its title: the popup draws a titled one as a heading over the items
+		# below it, and one without a title says nothing and is dropped as an empty line.
 		var menu: PopupMenu = node
 		for item: int in menu.item_count:
-			if not menu.is_item_separator(item):
-				_keep(item_says(menu, item), lines)
+			_keep(item_says(menu, item), lines)
 	elif node is Tree:
 		var tree: Tree = node
 		if tree.column_titles_visible:

package/build/index.js

@@ -30672,7 +30672,7 @@ var TOOL_SPECS = [
       says: {
         type: "string",
         ops: ["find"],
-        description: "find: part of what the node has written on it as drawn, the way the text op reads it, case-insensitively, which is how a button is reached by the word on it rather than by a generated path. Its own text, so a row is found by the label in it, and hidden nodes match. A bare word is a contains; write a glob and it is one, matched against the whole of what the node says, the same as namePattern. A label with a line break is matched with the break in the words, and a backslash followed by n counts as one."
+        description: "find: part of what the node has written on it as drawn, the way the text op reads it, case-insensitively, which is how a button is reached by the word on it rather than by a generated path. Its own text, so a row is found by the label in it, and hidden nodes match. A bare word is a contains; write a glob and it is one, matched against the whole of what the node says, the same as namePattern, and a glob that finds nothing says under note how many nodes it would find open at both ends. A label with a line break is matched with the break in the words, and a backslash followed by n counts as one."
       },
       limit: {
         type: "integer",
@@ -30701,7 +30701,7 @@ var TOOL_SPECS = [
     operations: {
       tree: { summary: "the live scene tree", requires: [] },
       text: {
-        summary: "every line of text under nodePath, the values in its fields included, in the order somebody reads the screen, leaving out what is hidden and everything under it. Every line reads as drawn: rich text without its tags, text only as far as it has been typed out, a translation rather than its key, an upper-case label in capitals and a secret field as its mask. Tab titles, menu bar titles, list items, a tree's column titles and rows, and an open menu's items read a line each",
+        summary: "every line of text under nodePath, the values in its fields included, in the order somebody reads the screen, leaving out what is hidden and everything under it. Every line reads as drawn: rich text without its tags, text only as far as it has been typed out, a translation rather than its key, an upper-case label in capitals and a secret field as its mask. Tab titles, menu bar titles, list items, a tree's column titles and rows, and an open menu's items and the titles of its separators read a line each",
         requires: []
       },
       find: {
@@ -30722,7 +30722,7 @@ var TOOL_SPECS = [
   },
   {
     name: "runtime_invoke",
-    description: "Sets a property or calls a method on a node in the running game. Needs the game running with the runtime addon. A call that takes longer than timeoutMs is not cancelled: the answer is pending: true with a requestId, the call goes on and does everything it was asked, and op result with that requestId collects its reply once it comes.",
+    description: "Sets a property or calls a method on a node in the running game. Needs the game running with the runtime addon. The answer carries elapsed_usec, how long the call or the write took inside the game, measured around it there: the round trip to the game is a second or more, so timing from outside measures that instead. A call that takes longer than timeoutMs is not cancelled: the answer is pending: true with a requestId, the call goes on and does everything it was asked, and op result with that requestId collects its reply once it comes.",
     parameters: {
       projectPath: RUNNING_PROJECT_PATH,
       pid: RUNNING_PID,

package/package.json

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