gdharness 0.7.0 → 0.8.0

package/build/cli.js

@@ -15783,6 +15783,11 @@ var init_tool_definitions = __esm(() => {
           description: 'find: a case-insensitive glob on the node name, such as "Enemy*".'
         },
         group: { type: "string", ops: ["find"], description: "find: a group the node is in." },
+        says: {
+          type: "string",
+          ops: ["find"],
+          description: "find: part of what the node has written on 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."
+        },
         limit: {
           type: "number",
           ops: ["find", "text"],
@@ -15808,7 +15813,7 @@ var init_tool_definitions = __esm(() => {
           requires: []
         },
         find: {
-          summary: "the paths of every node matching className, script, namePattern or group, with property read off each",
+          summary: "the paths of every node matching className, script, namePattern, group or says, with property read off each",
           requires: []
         },
         rect: {
@@ -15874,7 +15879,11 @@ var init_tool_definitions = __esm(() => {
           ops: ["click", "choose"],
           description: "click: the Control to click, at its centre, or the 3D node to click, where it is drawn. choose: the PopupMenu, or the OptionButton or MenuButton in front of one."
         },
-        action: { type: "string", ops: ["action"], description: "action: the InputMap action name." },
+        action: {
+          type: "string",
+          ops: ["action"],
+          description: "action: the InputMap action name. An engine dialog is not answered this way: AcceptDialog reads the Escape key itself and never asks the InputMap, so ui_cancel goes in and the question stays up. Dismiss one with key Escape, or click its button."
+        },
         pressed: {
           type: "boolean",
           ops: ["action", "key", "mouse_click"],
@@ -37491,6 +37500,7 @@ class GodotServer {
     const script = readNonEmptyString(args, "script");
     const namePattern = readNonEmptyString(args, "namePattern");
     const group = readNonEmptyString(args, "group");
+    const says = readNonEmptyString(args, "says");
     if (className !== undefined)
       filters["class"] = className;
     if (script !== undefined)
@@ -37499,8 +37509,10 @@ class GodotServer {
       filters["name"] = namePattern;
     if (group !== undefined)
       filters["group"] = group;
+    if (says !== undefined)
+      filters["says"] = says;
     if (Object.keys(filters).length === 0) {
-      return this.createErrorResponse("runtime_inspect find needs at least one of className, script, namePattern, group.");
+      return this.createErrorResponse("runtime_inspect find needs at least one of className, script, namePattern, group, says.");
     }
     const property = readNonEmptyString(args, "property");
     return await this.handleRuntimeCommand("find_nodes", {
@@ -38905,13 +38917,15 @@ that is running, and the project on disk. ${TOOL_SPECS.length} tools, named \`do
 | Ask | Tool |
 | --- | --- |
 | What a screen says | \`runtime_inspect text\`, which reads what is drawn and leaves out what is hidden |
+| Find a control by the word on it | \`runtime_inspect find\` with \`says\`, rather than listing a screen and reading each one |
 | Where a control is, and whether it is visible | \`runtime_inspect\` \`find\`, \`rect\` |
 | What a property reads right now | \`runtime_inspect\` \`property\`, \`runtime_invoke\` |
 | Press a button | \`runtime_input click\`, which says what was under the pointer |
 | Fill in a field | \`runtime_input click\` on it, then \`runtime_input text\` with \`replace\`; a submitted field has to be clicked again |
 | Click somebody standing in a 3D room | \`runtime_input click\` on the Node3D, which aims at what it draws |
 | Pick something out of a dropdown | \`runtime_input choose\` on it, by what the item says |
-| Answer a dialog, or press a bound key | \`runtime_input action\` or \`key\`, a whole press unless you hold it |
+| Answer a dialog | \`runtime_input click\` on its button, or \`key\` Escape to dismiss it: an [AcceptDialog] reads that key itself and never asks the InputMap, so \`ui_cancel\` leaves it standing |
+| Press a bound key | \`runtime_input action\` or \`key\`, a whole press unless you hold it |
 | Where a 3D node is on screen | \`runtime_inspect\` \`rect\`, rather than unprojecting by hand |
 | Wait for something | \`runtime_wait\`, never a sleep |
 | A picture, for a person who asked to see one | \`runtime_capture\` |

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

@@ -10,6 +10,10 @@ const Values = preload("runtime_values.gd")
 const FIND_LIMIT: int = 100
 const FIND_LIMIT_CEILING: int = 1000
 
+## What a find can be narrowed by, which is also what it refuses to answer without. Named once so
+## the refusal lists the same set the walk reads.
+const FILTERS: PackedStringArray = ["class", "script", "name", "group", "says"]
+
 ## The most lines one read answers with, unless asked for fewer. A screen is a few dozen; a
 ## thousand is a tree somebody pointed this at by mistake.
 const READ_LIMIT: int = 500
@@ -39,7 +43,8 @@ func get_tree(params: Dictionary) -> Dictionary:
 
 ## Nodes matching every filter given, as paths, so a caller can name what it wants without
 ## reading the whole tree to find it. `class` matches native classes and their subclasses, and
-## the global name of a script class; `name` is a case-insensitive glob; `script` is a path.
+## the global name of a script class; `name` is a case-insensitive glob; `script` is a path;
+## `says` is what the node has written on it.
 ##
 ## `property` names one to read off each of them, which is the difference between one question and
 ## one call per answer. A panel of a dozen labels took thirteen calls to read, and a tree that
@@ -48,22 +53,16 @@ func get_tree(params: Dictionary) -> Dictionary:
 ## because null is what a node holding null answers.
 func find_nodes(params: Dictionary) -> Dictionary:
 	var root_path: String = str(params.get("root", "/root"))
-	var wanted_class: String = str(params.get("class", ""))
-	var wanted_script: String = str(params.get("script", ""))
-	var wanted_name: String = str(params.get("name", ""))
-	var wanted_group: String = str(params.get("group", ""))
+	var wanted: Dictionary[String, String] = {}
+	for filter: String in FILTERS:
+		wanted[filter] = str(params.get(filter, ""))
 	var wanted_property: String = str(params.get("property", ""))
 	var limit: int = clampi(int(params.get("limit", FIND_LIMIT)), 1, FIND_LIMIT_CEILING)
 
-	if (
-		wanted_class.is_empty()
-		and wanted_script.is_empty()
-		and wanted_name.is_empty()
-		and wanted_group.is_empty()
-	):
-		return {"type": "error", "message": "find_nodes needs at least one of class, script, name, group"}
-	if not wanted_script.is_empty() and not wanted_script.begins_with("res://"):
-		wanted_script = "res://" + wanted_script
+	if not _anything_asked(wanted):
+		return {"type": "error", "message": "find_nodes needs at least one of " + ", ".join(FILTERS)}
+	if not wanted["script"].is_empty() and not wanted["script"].begins_with("res://"):
+		wanted["script"] = "res://" + wanted["script"]
 
 	var root: Node = _host.get_tree().root.get_node_or_null(root_path)
 	if root == null:
@@ -74,7 +73,7 @@ func find_nodes(params: Dictionary) -> Dictionary:
 	var truncated: bool = false
 	while not pending.is_empty():
 		var node: Node = pending.pop_front()
-		if _matches(node, wanted_class, wanted_script, wanted_name, wanted_group):
+		if _matches(node, wanted):
 			if found.size() >= limit:
 				truncated = true
 				break
@@ -115,25 +114,37 @@ func _found(node: Node, wanted_property: String) -> Dictionary:
 	return entry
 
 
-func _matches(
-	node: Node, wanted_class: String, wanted_script: String, wanted_name: String, wanted_group: String
-) -> bool:
-	if not wanted_group.is_empty() and not node.is_in_group(wanted_group):
+## Whether the caller named anything to match on, since every filter left out matches everything
+## and a find with none of them is the whole tree by another name.
+static func _anything_asked(wanted: Dictionary[String, String]) -> bool:
+	for filter: String in wanted:
+		if not wanted[filter].is_empty():
+			return true
+	return false
+
+
+func _matches(node: Node, wanted: Dictionary[String, String]) -> bool:
+	if not wanted["group"].is_empty() and not node.is_in_group(wanted["group"]):
+		return false
+	if not wanted["name"].is_empty() and not str(node.name).matchn(wanted["name"]):
 		return false
-	if not wanted_name.is_empty() and not str(node.name).matchn(wanted_name):
+	# What this node says, rather than everything said underneath it. A row is then found by the
+	# label in it, and the path answered is that label's, which is where the words a caller is
+	# looking at actually are: matching every container above it would answer with the screen.
+	if not wanted["says"].is_empty() and not _said_by(node).containsn(wanted["says"]):
 		return false
 	var script: Variant = node.get_script()
-	if not wanted_script.is_empty():
+	if not wanted["script"].is_empty():
 		if not script is Script:
 			return false
 		var attached: Script = script
-		if attached.resource_path != wanted_script:
+		if attached.resource_path != wanted["script"]:
 			return false
-	if not wanted_class.is_empty() and not node.is_class(wanted_class):
+	if not wanted["class"].is_empty() and not node.is_class(wanted["class"]):
 		if not script is Script:
 			return false
 		var attached: Script = script
-		if attached.get_global_name() != wanted_class:
+		if attached.get_global_name() != wanted["class"]:
 			return false
 	return true
 

package/build/index.js

@@ -28336,6 +28336,11 @@ var TOOL_SPECS = [
         description: 'find: a case-insensitive glob on the node name, such as "Enemy*".'
       },
       group: { type: "string", ops: ["find"], description: "find: a group the node is in." },
+      says: {
+        type: "string",
+        ops: ["find"],
+        description: "find: part of what the node has written on 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."
+      },
       limit: {
         type: "number",
         ops: ["find", "text"],
@@ -28361,7 +28366,7 @@ var TOOL_SPECS = [
         requires: []
       },
       find: {
-        summary: "the paths of every node matching className, script, namePattern or group, with property read off each",
+        summary: "the paths of every node matching className, script, namePattern, group or says, with property read off each",
         requires: []
       },
       rect: {
@@ -28427,7 +28432,11 @@ var TOOL_SPECS = [
         ops: ["click", "choose"],
         description: "click: the Control to click, at its centre, or the 3D node to click, where it is drawn. choose: the PopupMenu, or the OptionButton or MenuButton in front of one."
       },
-      action: { type: "string", ops: ["action"], description: "action: the InputMap action name." },
+      action: {
+        type: "string",
+        ops: ["action"],
+        description: "action: the InputMap action name. An engine dialog is not answered this way: AcceptDialog reads the Escape key itself and never asks the InputMap, so ui_cancel goes in and the question stays up. Dismiss one with key Escape, or click its button."
+      },
       pressed: {
         type: "boolean",
         ops: ["action", "key", "mouse_click"],
@@ -30272,6 +30281,7 @@ class GodotServer {
     const script = readNonEmptyString(args, "script");
     const namePattern = readNonEmptyString(args, "namePattern");
     const group = readNonEmptyString(args, "group");
+    const says = readNonEmptyString(args, "says");
     if (className !== undefined)
       filters["class"] = className;
     if (script !== undefined)
@@ -30280,8 +30290,10 @@ class GodotServer {
       filters["name"] = namePattern;
     if (group !== undefined)
       filters["group"] = group;
+    if (says !== undefined)
+      filters["says"] = says;
     if (Object.keys(filters).length === 0) {
-      return this.createErrorResponse("runtime_inspect find needs at least one of className, script, namePattern, group.");
+      return this.createErrorResponse("runtime_inspect find needs at least one of className, script, namePattern, group, says.");
     }
     const property = readNonEmptyString(args, "property");
     return await this.handleRuntimeCommand("find_nodes", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdharness",
-  "version": "0.7.0",
+  "version": "0.8.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",