gdharness 1.1.3 → 1.1.4

package/build/cli.js

@@ -114,11 +114,11 @@ function startTimesOf(pids) {
 }
 async function processTree() {
   try {
-    if (process.platform === "win32") {
-      return parseProcessTable(await askWindows(), true);
-    }
-    return parseProcessTable(await askPosix());
-  } catch {
+    const tree = process.platform === "win32" ? parseProcessTable(await askWindows(), true) : parseProcessTable(await askPosix());
+    lastListingFailure = undefined;
+    return tree;
+  } catch (error) {
+    lastListingFailure = error instanceof Error ? error.message : String(error);
     return;
   }
 }
@@ -256,7 +256,7 @@ async function askWindows() {
     "-NoProfile",
     "-NonInteractive",
     "-Command",
-    `${POWERSHELL_UTF8}Get-CimInstance Win32_Process | ForEach-Object { $began = 0; if ($_.CreationDate) { $began = ([DateTimeOffset]$_.CreationDate).ToUnixTimeMilliseconds() }; "$($_.ProcessId) $($_.ParentProcessId) $began $($_.CommandLine)" }`
+    `${POWERSHELL_UTF8}Get-CimInstance Win32_Process -Property ProcessId,ParentProcessId,CreationDate,CommandLine | ForEach-Object { $began = 0; if ($_.CreationDate) { $began = ([DateTimeOffset]$_.CreationDate).ToUnixTimeMilliseconds() }; "$($_.ProcessId) $($_.ParentProcessId) $began $($_.CommandLine)" }`
   ], { timeout: ASK_TIMEOUT_MS, windowsHide: true, maxBuffer: 16 * 1024 * 1024 });
   return stdout;
 }
@@ -267,7 +267,7 @@ async function askPosix() {
   });
   return stdout;
 }
-var run, POWERSHELL_UTF8 = "[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; ", ASK_TIMEOUT_MS = 15000;
+var run, POWERSHELL_UTF8 = "[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; ", ASK_TIMEOUT_MS = 15000, lastListingFailure;
 var init_process_children = __esm(() => {
   run = promisify(execFile);
 });
@@ -15992,7 +15992,7 @@ var init_tool_definitions = __esm(() => {
       requires: ["projectPath"],
       operations: {
         status: {
-          summary: "which resources are outdated or failed, or one resource with resourcePath: a source changed since its import, an import whose output under .godot/imported is gone (missing_outputs), and a glTF scene imported before the images it uses (imported_before), each with its reason",
+          summary: "which resources are outdated or failed, or one resource with resourcePath, judged by content as the editor judges it: a source whose hash differs from the one its import recorded, an import whose output under .godot/imported is gone (missing_outputs), and a glTF scene whose import does not depend on an image it names, because it was built before that image was imported (imported_without), each with its reason",
           requires: []
         },
         options: { summary: "the import options of one resource", requires: ["resourcePath"] },
@@ -41334,7 +41334,10 @@ class GodotServer {
       adopted.log.finish();
       adopted.exitCode = record.exitCode ?? null;
       adopted.exitSignal = record.exitSignal ?? null;
-      adopted.endedUnwatched = !exited(adopted);
+      const exitMayBeComing = !alive(record.pid) && !exited(adopted);
+      if (!exitMayBeComing) {
+        adopted.endedUnwatched = !exited(adopted);
+      }
     }
     this.activeProcess = adopted;
     return adopted;

package/build/godot/operations/import_pipeline.gd

@@ -383,10 +383,6 @@ func _import_status_of(resource_path: String, import_file_path: String) -> Dicti
 	var status: Dictionary = {
 		"path": resource_path, "status": "up_to_date", "import_file_exists": true, "source_exists": true
 	}
-	if FileAccess.get_modified_time(resource_path) > FileAccess.get_modified_time(import_file_path):
-		status["status"] = "needs_reimport"
-		status["reason"] = "the source changed after it was imported"
-		return status
 
 	# The sidecar alone does not say the import is there: deleting the outputs under
 	# .godot/imported is the ordinary way to force one, and a resource whose output is gone was
@@ -402,23 +398,59 @@ func _import_status_of(resource_path: String, import_file_path: String) -> Dicti
 		status["missing_outputs"] = missing
 		return status
 
-	# A scene imported before the textures it uses were: it loads each image as it imports, so one
-	# imported ahead of them is built without them, and nothing about its own files says so. A second
-	# reimport started over one in progress did exactly that downstream, and 64 scenes that were
-	# untextured all read as up to date here.
-	var built_at: int = _oldest(outputs, import_file_path)
-	var before: Array[String] = []
-	for image: String in _images_of(resource_path):
-		if FileAccess.file_exists(image + ".import"):
-			if _newest(_outputs_of(image + ".import"), image + ".import") > built_at:
-				before.append(image)
-	if not before.is_empty():
+	# By content, as the editor judges it: the hash of the source the import recorded, against the
+	# file. By time, an installer that rewrote 31 images byte for byte made every one read as changed,
+	# and the editor, which compares the hash, rightly imported none of them.
+	var recorded: String = _recorded_source_md5(resource_path)
+	var changed: bool = (
+		FileAccess.get_md5(resource_path) != recorded
+		if not recorded.is_empty()
+		else FileAccess.get_modified_time(resource_path) > FileAccess.get_modified_time(import_file_path)
+	)
+	if changed:
+		status["status"] = "needs_reimport"
+		status["reason"] = "the source changed after it was imported"
+		return status
+
+	# A scene built without an image it names: it loads each one as it imports, so one imported
+	# before the image was is built without it. Read off what the imported scene depends on, not off
+	# file times: a texture a 3D scene uses is reimported compressed after the scene, so its outputs
+	# are always the newer, and 33 correct scenes read as stale when judged that way.
+	var without: Array[String] = []
+	var images: Array[String] = _images_of(resource_path)
+	if not images.is_empty():
+		var depended: PackedStringArray = ResourceLoader.get_dependencies(resource_path)
+		for image: String in images:
+			if FileAccess.file_exists(image + ".import") and not _names(depended, image):
+				without.append(image)
+	if not without.is_empty():
 		status["status"] = "needs_reimport"
-		status["reason"] = "it was imported before the images it uses, so it was built without them"
-		status["imported_before"] = before
+		status["reason"] = "it was imported without images it uses, which were not imported yet"
+		status["imported_without"] = without
 	return status
 
 
+## The hash of its source that [param resource_path]'s last import recorded, or "" when there is no
+## record: the editor keeps it beside the outputs, under the same base name with [code].md5[/code].
+static func _recorded_source_md5(resource_path: String) -> String:
+	var record: String = (
+		"res://.godot/imported/%s-%s.md5" % [resource_path.get_file(), resource_path.md5_text()]
+	)
+	var config: ConfigFile = ConfigFile.new()
+	if config.load(record) != OK:
+		return ""
+	return str(config.get_value("", "source_md5", ""))
+
+
+## Whether [param dependencies], as [method ResourceLoader.get_dependencies] lists them, include
+## [param path]; each entry may carry a uid and a type ahead of the path.
+static func _names(dependencies: PackedStringArray, path: String) -> bool:
+	for entry: String in dependencies:
+		if entry == path or entry.ends_with("::" + path):
+			return true
+	return false
+
+
 ## The files an import wrote, from its sidecar's [code]dest_files[/code]; empty when it lists none.
 static func _outputs_of(import_file_path: String) -> Array[String]:
 	var config: ConfigFile = ConfigFile.new()
@@ -432,25 +464,6 @@ static func _outputs_of(import_file_path: String) -> Array[String]:
 	return outputs
 
 
-## When the earliest of [param outputs] was written, or [param fallback] when none is on disk.
-static func _oldest(outputs: Array[String], fallback: String) -> int:
-	var oldest: int = -1
-	for output: String in outputs:
-		if FileAccess.file_exists(output):
-			var at: int = FileAccess.get_modified_time(output)
-			oldest = at if oldest < 0 else mini(oldest, at)
-	return oldest if oldest >= 0 else FileAccess.get_modified_time(fallback)
-
-
-## When the latest of [param outputs] was written, or [param fallback] when none is on disk.
-static func _newest(outputs: Array[String], fallback: String) -> int:
-	var newest: int = -1
-	for output: String in outputs:
-		if FileAccess.file_exists(output):
-			newest = maxi(newest, FileAccess.get_modified_time(output))
-	return newest if newest >= 0 else FileAccess.get_modified_time(fallback)
-
-
 ## The image files a glTF scene refers to by path, resolved against the scene's own directory.
 ## Embedded images and every other scene format answer nothing.
 static func _images_of(scene_path: String) -> Array[String]:

package/build/index.js

@@ -24952,14 +24952,15 @@ function startTimesOf(pids) {
 var ASK_TIMEOUT_MS = 15000;
 async function processTree() {
   try {
-    if (process.platform === "win32") {
-      return parseProcessTable(await askWindows(), true);
-    }
-    return parseProcessTable(await askPosix());
-  } catch {
+    const tree = process.platform === "win32" ? parseProcessTable(await askWindows(), true) : parseProcessTable(await askPosix());
+    lastListingFailure = undefined;
+    return tree;
+  } catch (error) {
+    lastListingFailure = error instanceof Error ? error.message : String(error);
     return;
   }
 }
+var lastListingFailure;
 function parseProcessTable(printed, started = false) {
   const tree = new Map;
   for (const line of printed.split(/\r?\n/)) {
@@ -25094,7 +25095,7 @@ async function askWindows() {
     "-NoProfile",
     "-NonInteractive",
     "-Command",
-    `${POWERSHELL_UTF8}Get-CimInstance Win32_Process | ForEach-Object { $began = 0; if ($_.CreationDate) { $began = ([DateTimeOffset]$_.CreationDate).ToUnixTimeMilliseconds() }; "$($_.ProcessId) $($_.ParentProcessId) $began $($_.CommandLine)" }`
+    `${POWERSHELL_UTF8}Get-CimInstance Win32_Process -Property ProcessId,ParentProcessId,CreationDate,CommandLine | ForEach-Object { $began = 0; if ($_.CreationDate) { $began = ([DateTimeOffset]$_.CreationDate).ToUnixTimeMilliseconds() }; "$($_.ProcessId) $($_.ParentProcessId) $began $($_.CommandLine)" }`
   ], { timeout: ASK_TIMEOUT_MS, windowsHide: true, maxBuffer: 16 * 1024 * 1024 });
   return stdout;
 }
@@ -30118,7 +30119,7 @@ var TOOL_SPECS = [
     requires: ["projectPath"],
     operations: {
       status: {
-        summary: "which resources are outdated or failed, or one resource with resourcePath: a source changed since its import, an import whose output under .godot/imported is gone (missing_outputs), and a glTF scene imported before the images it uses (imported_before), each with its reason",
+        summary: "which resources are outdated or failed, or one resource with resourcePath, judged by content as the editor judges it: a source whose hash differs from the one its import recorded, an import whose output under .godot/imported is gone (missing_outputs), and a glTF scene whose import does not depend on an image it names, because it was built before that image was imported (imported_without), each with its reason",
         requires: []
       },
       options: { summary: "the import options of one resource", requires: ["resourcePath"] },
@@ -34072,7 +34073,10 @@ class GodotServer {
       adopted.log.finish();
       adopted.exitCode = record.exitCode ?? null;
       adopted.exitSignal = record.exitSignal ?? null;
-      adopted.endedUnwatched = !exited(adopted);
+      const exitMayBeComing = !alive(record.pid) && !exited(adopted);
+      if (!exitMayBeComing) {
+        adopted.endedUnwatched = !exited(adopted);
+      }
     }
     this.activeProcess = adopted;
     return adopted;

package/package.json

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