gdharness 1.3.58 → 1.3.60

package/build/godot/addons/gdharness_editor/property_values.gd

@@ -40,6 +40,7 @@ const HEADINGS: int = PROPERTY_USAGE_CATEGORY | PROPERTY_USAGE_GROUP | PROPERTY_
 ## Control's layout_mode values, which the engine does not expose as constants.
 const LAYOUT_MODE_POSITION: int = 0
 const LAYOUT_MODE_ANCHORS: int = 1
+const LAYOUT_MODE_UNCONTROLLED: int = 3
 ## What a container sets on each child it lays out, beside the anchors and offsets.
 const PLACED_BY_A_CONTAINER: Array[String] = ["position", "size", "global_position"]
 
@@ -366,8 +367,14 @@ func _laid_out(control: Control, name: String) -> String:
 			)
 			% [control.name, parent.name, parent.get_class(), base]
 		)
-	if anchoring and GdhRead.as_int(control.get("layout_mode")) == LAYOUT_MODE_POSITION:
+	var mode: int = GdhRead.as_int(control.get("layout_mode"))
+	if anchoring and mode == LAYOUT_MODE_POSITION:
 		control.set("layout_mode", LAYOUT_MODE_ANCHORS)
+	# A scene's root reads as Uncontrolled but keeps the Position mode it was made with until it
+	# enters a tree, and the engine ignores a preset in that stored mode, so full rect read back as
+	# top left on every root a headless edit wrote.
+	elif anchoring and mode == LAYOUT_MODE_UNCONTROLLED:
+		control.set("layout_mode", LAYOUT_MODE_UNCONTROLLED)
 	return ""
 
 

package/build/godot/addons/gdharness_editor/setting_reads.gd

@@ -16,6 +16,13 @@ static func one(setting_path: String, values: GdhSerialisation) -> Dictionary:
 
 	if result["exists"]:
 		var value: Variant = ProjectSettings.get_setting(setting_path)
+		var laid: Dictionary = laid_over(setting_path, override_files())
+		if not laid.is_empty():
+			if not Engine.is_editor_hint():
+				value = laid["project"]
+			result["overridden_in"] = {
+				"file": laid["file"], "value": values.serialize_value(laid["value"]),
+			}
 		result["value"] = values.serialize_value(value)
 		# A setting the engine registers exists whether or not the project sets it, so exists did
 		# not say whether project.godot has a line for it. At its default it has none: the engine
@@ -54,17 +61,25 @@ static func one(setting_path: String, values: GdhSerialisation) -> Dictionary:
 ## wrong: 2 is as true as true is.
 static func under(prefix: String, values: GdhSerialisation) -> Dictionary:
 	var found: Array[Dictionary] = []
+	var overrides: Array[Dictionary] = override_files()
 	for property: Dictionary in ProjectSettings.get_property_list():
 		var name: String = str(property.get("name", ""))
 		if not name.begins_with(prefix):
 			continue
 		var kind: int = GdhRead.as_int(property.get("type", TYPE_NIL), TYPE_NIL)
 		var value: Variant = ProjectSettings.get_setting(name)
+		var laid: Dictionary = laid_over(name, overrides)
+		if not laid.is_empty() and not Engine.is_editor_hint():
+			value = laid["project"]
 		var described: Dictionary = {
 			"setting": name,
 			"type": type_named(kind, value),
 			"value": values.serialize_value(value),
 		}
+		if not laid.is_empty():
+			described["overridden_in"] = {
+				"file": laid["file"], "value": values.serialize_value(laid["value"]),
+			}
 		# As a single get says it, so a family read can be told apart into what the project sets and
 		# the engine's defaults: "input/" is ninety actions the engine ships and the project's few.
 		var default_value: Variant = ProjectSettings.property_get_revert(name)
@@ -81,6 +96,49 @@ static func under(prefix: String, values: GdhSerialisation) -> Dictionary:
 	return { "prefix": prefix, "count": found.size(), "settings": found }
 
 
+## The files a run lays over project.godot, loaded, in the order the engine lays them, each as
+## {"file", "config"}: res://override.cfg, then the file
+## application/config/project_settings_override
+## names. The editor lays neither, so a game keeping a player's window size in user:// had that size
+## answered headless as the project's own setting, while the editor answered the project's.
+static func override_files() -> Array[Dictionary]:
+	var files: Array[Dictionary] = []
+	var named: String = str(
+		ProjectSettings.get_setting("application/config/project_settings_override", "")
+	)
+	for file: String in ["res://override.cfg", named]:
+		var config: ConfigFile = ConfigFile.new()
+		if not file.is_empty() and config.load(file) == OK:
+			files.append({ "file": file, "config": config })
+	return files
+
+
+## What the last of [param overrides], from [method override_files], to set [param setting_path]
+## sets it to, as {"file", "value", "project"}, where project is what project.godot holds, or the
+## engine's default where it has no line: the value the editor holds, unsaved changes aside. Empty
+## when none sets it.
+static func laid_over(setting_path: String, overrides: Array[Dictionary]) -> Dictionary:
+	var at: int = setting_path.find("/")
+	if at <= 0:
+		return {}
+	var section: String = setting_path.left(at)
+	var key: String = setting_path.substr(at + 1)
+	for index: int in range(overrides.size() - 1, -1, -1):
+		var config: ConfigFile = overrides[index]["config"]
+		if not config.has_section_key(section, key):
+			continue
+		var project: ConfigFile = ConfigFile.new()
+		var held: Variant = ProjectSettings.property_get_revert(setting_path)
+		if project.load("res://project.godot") == OK and project.has_section_key(section, key):
+			held = project.get_value(section, key)
+		return {
+			"file": overrides[index]["file"],
+			"value": config.get_value(section, key),
+			"project": held,
+		}
+	return {}
+
+
 ## The type [param kind] names, with what [param value] holds when it is a typed array or
 ## dictionary, as project.godot writes it: a `Dictionary[String, bool]` was answered as Dictionary,
 ## which hides what its keys and values must be.

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

@@ -804,12 +804,15 @@ static func with_methods_offered(said: String, object: Object, method: String) -
 			# to a refusal.
 			var flags: int = entry.get("flags", 0)
 			var callable: bool = not object is Script or flags & METHOD_FLAG_STATIC
-			if callable and not name.is_empty() and not own.has(name):
+			# A property's setter and getter are named by the engine, @asked_setter, and offered
+			# they
+			# crowded out the script's own methods with names nobody means.
+			if callable and not name.begins_with("@") and not name.is_empty() and not own.has(name):
 				own.append(name)
 	var every: Array[String] = own.duplicate()
 	for entry: Dictionary in GdhValues.methods_of(object):
 		var name: String = str(entry.get("name", ""))
-		if not every.has(name):
+		if not name.begins_with("@") and not every.has(name):
 			every.append(name)
 	var close: PackedStringArray = GdhRead.nearest(method, PackedStringArray(every))
 	if not close.is_empty():

package/build/godot/operations/project_config.gd

@@ -89,8 +89,13 @@ func set_project_setting(params: Dictionary) -> Dictionary:
 
 	var old_value: Variant = null
 	var had_value: bool = ProjectSettings.has_setting(setting_path)
+	var laid: Dictionary = GdhSettingReads.laid_over(
+		setting_path, GdhSettingReads.override_files()
+	)
 	if had_value:
-		old_value = ProjectSettings.get_setting(setting_path)
+		old_value = (
+			ProjectSettings.get_setting(setting_path) if laid.is_empty() else laid["project"]
+		)
 	# A setting the engine registers is there with its default whether or not project.godot sets it,
 	# so has_setting alone called the description of a project that had never set one an old value.
 	# Whether it is new is the file's to say: one at its default has a line only where the project
@@ -131,6 +136,16 @@ func set_project_setting(params: Dictionary) -> Dictionary:
 		"was_default": was_default,
 		"saved": true,
 	}
+	if not laid.is_empty():
+		var read: Variant = _values.serialize_value(laid["value"])
+		answer["overridden_in"] = { "file": laid["file"], "value": read }
+		answer["overriddenNote"] = (
+			(
+				"A run on this machine still reads %s for it from %s, which a run lays over "
+				+ "project.godot and the editor does not."
+			)
+			% [JSON.stringify(read), laid["file"]]
+		)
 	# The same value in the same type is no change, and the file is left alone: a save rewrites it
 	# whole. The type is compared as well, so an int setting the file holds as 50.0 is still put
 	# right.
@@ -254,6 +269,11 @@ func unset_project_setting(params: Dictionary) -> Dictionary:
 	var default_value: Variant = ProjectSettings.property_get_revert(setting_path)
 	var held: bool = ProjectSettings.has_setting(setting_path)
 	var value: Variant = ProjectSettings.get_setting(setting_path) if held else null
+	var laid: Dictionary = GdhSettingReads.laid_over(
+		setting_path, GdhSettingReads.override_files()
+	)
+	if held and not laid.is_empty():
+		value = laid["project"]
 	var answer: Dictionary = {
 		"setting_path": setting_path,
 		"default_value": _values.serialize_value(default_value) if default_value != null else null,

package/build/godot/operations/property_values.gd

@@ -40,6 +40,7 @@ const HEADINGS: int = PROPERTY_USAGE_CATEGORY | PROPERTY_USAGE_GROUP | PROPERTY_
 ## Control's layout_mode values, which the engine does not expose as constants.
 const LAYOUT_MODE_POSITION: int = 0
 const LAYOUT_MODE_ANCHORS: int = 1
+const LAYOUT_MODE_UNCONTROLLED: int = 3
 ## What a container sets on each child it lays out, beside the anchors and offsets.
 const PLACED_BY_A_CONTAINER: Array[String] = ["position", "size", "global_position"]
 
@@ -366,8 +367,14 @@ func _laid_out(control: Control, name: String) -> String:
 			)
 			% [control.name, parent.name, parent.get_class(), base]
 		)
-	if anchoring and GdhRead.as_int(control.get("layout_mode")) == LAYOUT_MODE_POSITION:
+	var mode: int = GdhRead.as_int(control.get("layout_mode"))
+	if anchoring and mode == LAYOUT_MODE_POSITION:
 		control.set("layout_mode", LAYOUT_MODE_ANCHORS)
+	# A scene's root reads as Uncontrolled but keeps the Position mode it was made with until it
+	# enters a tree, and the engine ignores a preset in that stored mode, so full rect read back as
+	# top left on every root a headless edit wrote.
+	elif anchoring and mode == LAYOUT_MODE_UNCONTROLLED:
+		control.set("layout_mode", LAYOUT_MODE_UNCONTROLLED)
 	return ""
 
 

package/build/godot/operations/setting_reads.gd

@@ -16,6 +16,13 @@ static func one(setting_path: String, values: GdhSerialisation) -> Dictionary:
 
 	if result["exists"]:
 		var value: Variant = ProjectSettings.get_setting(setting_path)
+		var laid: Dictionary = laid_over(setting_path, override_files())
+		if not laid.is_empty():
+			if not Engine.is_editor_hint():
+				value = laid["project"]
+			result["overridden_in"] = {
+				"file": laid["file"], "value": values.serialize_value(laid["value"]),
+			}
 		result["value"] = values.serialize_value(value)
 		# A setting the engine registers exists whether or not the project sets it, so exists did
 		# not say whether project.godot has a line for it. At its default it has none: the engine
@@ -54,17 +61,25 @@ static func one(setting_path: String, values: GdhSerialisation) -> Dictionary:
 ## wrong: 2 is as true as true is.
 static func under(prefix: String, values: GdhSerialisation) -> Dictionary:
 	var found: Array[Dictionary] = []
+	var overrides: Array[Dictionary] = override_files()
 	for property: Dictionary in ProjectSettings.get_property_list():
 		var name: String = str(property.get("name", ""))
 		if not name.begins_with(prefix):
 			continue
 		var kind: int = GdhRead.as_int(property.get("type", TYPE_NIL), TYPE_NIL)
 		var value: Variant = ProjectSettings.get_setting(name)
+		var laid: Dictionary = laid_over(name, overrides)
+		if not laid.is_empty() and not Engine.is_editor_hint():
+			value = laid["project"]
 		var described: Dictionary = {
 			"setting": name,
 			"type": type_named(kind, value),
 			"value": values.serialize_value(value),
 		}
+		if not laid.is_empty():
+			described["overridden_in"] = {
+				"file": laid["file"], "value": values.serialize_value(laid["value"]),
+			}
 		# As a single get says it, so a family read can be told apart into what the project sets and
 		# the engine's defaults: "input/" is ninety actions the engine ships and the project's few.
 		var default_value: Variant = ProjectSettings.property_get_revert(name)
@@ -81,6 +96,49 @@ static func under(prefix: String, values: GdhSerialisation) -> Dictionary:
 	return { "prefix": prefix, "count": found.size(), "settings": found }
 
 
+## The files a run lays over project.godot, loaded, in the order the engine lays them, each as
+## {"file", "config"}: res://override.cfg, then the file
+## application/config/project_settings_override
+## names. The editor lays neither, so a game keeping a player's window size in user:// had that size
+## answered headless as the project's own setting, while the editor answered the project's.
+static func override_files() -> Array[Dictionary]:
+	var files: Array[Dictionary] = []
+	var named: String = str(
+		ProjectSettings.get_setting("application/config/project_settings_override", "")
+	)
+	for file: String in ["res://override.cfg", named]:
+		var config: ConfigFile = ConfigFile.new()
+		if not file.is_empty() and config.load(file) == OK:
+			files.append({ "file": file, "config": config })
+	return files
+
+
+## What the last of [param overrides], from [method override_files], to set [param setting_path]
+## sets it to, as {"file", "value", "project"}, where project is what project.godot holds, or the
+## engine's default where it has no line: the value the editor holds, unsaved changes aside. Empty
+## when none sets it.
+static func laid_over(setting_path: String, overrides: Array[Dictionary]) -> Dictionary:
+	var at: int = setting_path.find("/")
+	if at <= 0:
+		return {}
+	var section: String = setting_path.left(at)
+	var key: String = setting_path.substr(at + 1)
+	for index: int in range(overrides.size() - 1, -1, -1):
+		var config: ConfigFile = overrides[index]["config"]
+		if not config.has_section_key(section, key):
+			continue
+		var project: ConfigFile = ConfigFile.new()
+		var held: Variant = ProjectSettings.property_get_revert(setting_path)
+		if project.load("res://project.godot") == OK and project.has_section_key(section, key):
+			held = project.get_value(section, key)
+		return {
+			"file": overrides[index]["file"],
+			"value": config.get_value(section, key),
+			"project": held,
+		}
+	return {}
+
+
 ## The type [param kind] names, with what [param value] holds when it is a typed array or
 ## dictionary, as project.godot writes it: a `Dictionary[String, bool]` was answered as Dictionary,
 ## which hides what its keys and values must be.

package/build/godot/tests/listed.gd

@@ -549,7 +549,25 @@ class GdhRunner:
 			return
 		if Engine.is_embedded_in_editor():
 			return
-		if DisplayServer.window_get_mode() == DisplayServer.WINDOW_MODE_MINIMIZED:
+		var mode: DisplayServer.WindowMode = DisplayServer.window_get_mode()
+		if mode == DisplayServer.WINDOW_MODE_MAXIMIZED and not DisplayServer.window_can_draw():
+			# On macOS Godot reads a window whose frame fills the usable screen as maximised before
+			# asking whether it is minimised, and changing the mode from that reading unzooms it, so
+			# a minimised window that size, as a small screen makes the default one, stayed
+			# minimised. A point off it reads as what it is, and goes back once restored. Godot
+			# divides pixels by the scale into whole points, so a pixel moves nothing on a scaled
+			# screen.
+			var at: Vector2i = DisplayServer.window_get_position()
+			DisplayServer.window_set_position(
+				at + Vector2i(ceili(DisplayServer.screen_get_max_scale()), 0)
+			)
+			mode = DisplayServer.window_get_mode()
+			if mode == DisplayServer.WINDOW_MODE_MINIMIZED:
+				DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED)
+				minimise_pending = false
+			DisplayServer.window_set_position(at)
+			return
+		if mode == DisplayServer.WINDOW_MODE_MINIMIZED:
 			DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED)
 			minimise_pending = false
 

package/build/keeper.js

@@ -6946,7 +6946,7 @@ var require_public_api = __commonJS(function(exports) {
 });
 
 // src/keeper.ts
-import { closeSync as closeSync3, existsSync as existsSync3, mkdtempSync as mkdtempSync4, openSync as openSync4, readFileSync as readFileSync9, rmSync as rmSync7, writeFileSync as writeFileSync4 } from "node:fs";
+import { closeSync as closeSync3, existsSync as existsSync4, mkdtempSync as mkdtempSync4, openSync as openSync4, readFileSync as readFileSync9, rmSync as rmSync7, writeFileSync as writeFileSync4 } from "node:fs";
 import { tmpdir as tmpdir8 } from "node:os";
 import { join as join10 } from "node:path";
 import { setTimeout as delay3 } from "node:timers/promises";
@@ -7435,6 +7435,7 @@ function throughHelper(how, command, args, files, assembly = helperAssembly()) {
 // src/engine-slots.ts
 import {
   closeSync as closeSync2,
+  existsSync as existsSync2,
   mkdirSync,
   openSync as openSync2,
   readdirSync,
@@ -9338,7 +9339,7 @@ var IMPORTABLE = new Set(IMPORTABLE_EXTENSIONS);
 var hashes = new Map;
 
 // src/scratch.ts
-import { existsSync as existsSync2, mkdtempSync as mkdtempSync2, readdirSync as readdirSync2, rmSync as rmSync4 } from "node:fs";
+import { existsSync as existsSync3, mkdtempSync as mkdtempSync2, readdirSync as readdirSync2, rmSync as rmSync4 } from "node:fs";
 import { tmpdir as tmpdir5 } from "node:os";
 import { join as join4 } from "node:path";
 import process6 from "node:process";
@@ -9383,7 +9384,7 @@ function tryAgain(path, attempt) {
     lastTryOnExit();
   }
   const after = AGAIN_AFTER_MS[attempt];
-  if (after === undefined || !existsSync2(path)) {
+  if (after === undefined || !existsSync3(path)) {
     waiting.delete(path);
     if (after === undefined) {
       atExit.add(path);
@@ -10888,7 +10889,7 @@ async function startThroughHelper(spec, output, stopFile) {
       exited.now = true;
     });
     for (let waited = 0;waited < DESKTOP_START_MS; waited += 50) {
-      const pid = existsSync3(pidFile) ? Number(readFileSync9(pidFile, "utf8").trim()) : Number.NaN;
+      const pid = existsSync4(pidFile) ? Number(readFileSync9(pidFile, "utf8").trim()) : Number.NaN;
       if (Number.isInteger(pid) && pid > 0) {
         return { child: started.child, pid };
       }

package/package.json

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