gdharness 1.2.5 → 1.2.7

package/build/cli.js

@@ -8129,7 +8129,7 @@ function alive(pid) {
 var init_alive = () => {};
 
 // src/scratch.ts
-import { existsSync as existsSync6, mkdtempSync, readdirSync as readdirSync2, rmSync as rmSync4 } from "node:fs";
+import { existsSync as existsSync6, mkdtempSync, readdirSync as readdirSync3, rmSync as rmSync4 } from "node:fs";
 import { tmpdir } from "node:os";
 import { join as join6 } from "node:path";
 import process6 from "node:process";
@@ -8139,7 +8139,7 @@ function scratchDirectory(kind) {
 function sweepAbandonedScratch(directory = tmpdir()) {
   let entries;
   try {
-    entries = readdirSync2(directory);
+    entries = readdirSync3(directory);
   } catch {
     return;
   }
@@ -9461,7 +9461,7 @@ var init_gdscript_source = __esm(() => {
 });
 
 // src/class-cache.ts
-import { existsSync as existsSync9, readdirSync as readdirSync3, readFileSync as readFileSync7, statSync as statSync4 } from "node:fs";
+import { existsSync as existsSync9, readdirSync as readdirSync4, readFileSync as readFileSync7, statSync as statSync4 } from "node:fs";
 import { join as join9, posix } from "node:path";
 function isToolScript(source) {
   return TOOL.test(codeOf(source));
@@ -9481,7 +9481,7 @@ function eachScript(projectPath, each) {
     if (existsSync9(join9(directory, ".gdignore"))) {
       return;
     }
-    for (const entry of readdirSync3(directory, { withFileTypes: true })) {
+    for (const entry of readdirSync4(directory, { withFileTypes: true })) {
       if (entry.name.startsWith(".")) {
         continue;
       }
@@ -17266,7 +17266,7 @@ import {
   cpSync,
   existsSync as existsSync10,
   mkdirSync as mkdirSync4,
-  readdirSync as readdirSync4,
+  readdirSync as readdirSync5,
   readFileSync as readFileSync9,
   rmdirSync,
   rmSync as rmSync5,
@@ -17284,7 +17284,7 @@ function runtimeAddonDigest(from = shippedAddonsDirectory()) {
 function addonsDigest(names, from) {
   const hash = createHash3("sha256");
   const walk = (directory, relative) => {
-    for (const name of readdirSync4(directory).sort()) {
+    for (const name of readdirSync5(directory).sort()) {
       if (name === VERSION_MARKER || name === DIGEST_MARKER) {
         continue;
       }
@@ -17386,7 +17386,7 @@ function removeAddons(projectPath) {
     }
   }
   const addons = join10(projectPath, "addons");
-  if (removed.length > 0 && existsSync10(addons) && readdirSync4(addons).length === 0) {
+  if (removed.length > 0 && existsSync10(addons) && readdirSync5(addons).length === 0) {
     rmdirSync(addons);
     removed.push(addons);
   }
@@ -33897,7 +33897,7 @@ var init_stdio2 = __esm(() => {
 });
 
 // src/runtime-client.ts
-import { existsSync as existsSync12, readdirSync as readdirSync6, readFileSync as readFileSync11, statSync as statSync6, unlinkSync } from "node:fs";
+import { existsSync as existsSync12, readdirSync as readdirSync7, readFileSync as readFileSync11, statSync as statSync6, unlinkSync } from "node:fs";
 import { createConnection } from "node:net";
 import { tmpdir as tmpdir3 } from "node:os";
 import { dirname as dirname8, join as join13, resolve as resolve4 } from "node:path";
@@ -34067,7 +34067,7 @@ function announcedIn(directory) {
   const found = [];
   const candidates = [];
   const entries = [];
-  for (const entry of readdirSync6(directory)) {
+  for (const entry of readdirSync7(directory)) {
     const report = ERROR_REPORT_PATTERN.exec(entry);
     if (report) {
       sweepErrorReport(join13(directory, entry), Number.parseInt(report[1] ?? "", 10));
@@ -40554,7 +40554,7 @@ var init_process_time = __esm(() => {
 });
 
 // src/project-scan.ts
-import { existsSync as existsSync17, readdirSync as readdirSync7, readFileSync as readFileSync18 } from "node:fs";
+import { existsSync as existsSync17, readdirSync as readdirSync8, readFileSync as readFileSync18 } from "node:fs";
 import { join as join21 } from "node:path";
 function skipped(name) {
   return name.startsWith(".") || SKIPPED.has(name);
@@ -40568,7 +40568,7 @@ function projectStructure(projectPath) {
     if (steppedOver(directory)) {
       return;
     }
-    for (const entry of readdirSync7(directory, { withFileTypes: true })) {
+    for (const entry of readdirSync8(directory, { withFileTypes: true })) {
       if (skipped(entry.name)) {
         continue;
       }
@@ -40597,7 +40597,7 @@ function scriptsWithoutUid(projectPath) {
     if (steppedOver(directory)) {
       return;
     }
-    for (const entry of readdirSync7(directory, { withFileTypes: true })) {
+    for (const entry of readdirSync8(directory, { withFileTypes: true })) {
       if (skipped(entry.name)) {
         continue;
       }
@@ -40627,7 +40627,7 @@ function projectTexts(projectPath) {
     if (steppedOver(directory)) {
       return;
     }
-    for (const entry of readdirSync7(directory, { withFileTypes: true })) {
+    for (const entry of readdirSync8(directory, { withFileTypes: true })) {
       if (skipped(entry.name)) {
         continue;
       }
@@ -40654,7 +40654,7 @@ function ignoredTexts(projectPath) {
   const found = [];
   const visit = (directory, prefix, ignored) => {
     const under = ignored || steppedOver(directory);
-    for (const entry of readdirSync7(directory, { withFileTypes: true })) {
+    for (const entry of readdirSync8(directory, { withFileTypes: true })) {
       if (skipped(entry.name)) {
         continue;
       }
@@ -40691,7 +40691,7 @@ function searchProject(projectPath, options) {
     if (steppedOver(directory)) {
       return;
     }
-    for (const entry of readdirSync7(directory, { withFileTypes: true })) {
+    for (const entry of readdirSync8(directory, { withFileTypes: true })) {
       if (full()) {
         return;
       }
@@ -41550,7 +41550,7 @@ var init_rename = __esm(() => {
 });
 
 // src/rename-symbol.ts
-import { existsSync as existsSync19, mkdirSync as mkdirSync12, readdirSync as readdirSync8, realpathSync as realpathSync5, rmSync as rmSync10, writeFileSync as writeFileSync14 } from "node:fs";
+import { existsSync as existsSync19, mkdirSync as mkdirSync12, readdirSync as readdirSync9, realpathSync as realpathSync5, rmSync as rmSync10, writeFileSync as writeFileSync14 } from "node:fs";
 import { basename as basename5, dirname as dirname16, join as join22, relative as relative4, resolve as resolve6 } from "node:path";
 function resourcePathOf(projectPath, absolute) {
   const inside = relative4(onDiskSpelling(projectPath), onDiskSpelling(absolute));
@@ -41998,7 +41998,7 @@ function writeLeftAloneDetail(projectPath, symbol, detail) {
   const path = join22(directory, `${String(Date.now())}-${String(detailWrites).padStart(6, "0")}-${String(process.pid)}-${symbol}.json`);
   writeFileSync14(path, `${JSON.stringify(detail, null, 2)}
 `, "utf8");
-  const kept = readdirSync8(directory).filter((name) => name.endsWith(".json")).sort().reverse();
+  const kept = readdirSync9(directory).filter((name) => name.endsWith(".json")).sort().reverse();
   for (const old of kept.slice(10)) {
     rmSync10(join22(directory, old), { force: true });
   }
@@ -42087,7 +42087,7 @@ import { createHash as createHash4 } from "node:crypto";
 import {
   mkdirSync as mkdirSync14,
   openSync as openSync2,
-  readdirSync as readdirSync9,
+  readdirSync as readdirSync10,
   readFileSync as readFileSync21,
   realpathSync as realpathSync6,
   rmSync as rmSync12,
@@ -42213,7 +42213,7 @@ function everyRunRecord() {
   for (const directory of runtimeDirectories()) {
     let entries;
     try {
-      entries = readdirSync9(join24(directory, "runs"));
+      entries = readdirSync10(join24(directory, "runs"));
     } catch {
       continue;
     }
@@ -42454,7 +42454,7 @@ function sweepTranscripts(keepMs = 24 * 60 * 60 * 1000, now = Date.now()) {
   ]));
   let entries;
   try {
-    entries = readdirSync9(directory);
+    entries = readdirSync10(directory);
   } catch {
     return;
   }
@@ -42721,7 +42721,7 @@ function callersOf(totals, name, scripts) {
   sites.sort((a, b) => (b.withinTotalMs ?? -1) - (a.withinTotalMs ?? -1) || a.script.localeCompare(b.script) || a.line - b.line);
   return { target, sites: sites.slice(0, CALL_SITES), omitted: Math.max(0, sites.length - CALL_SITES) };
 }
-var QUEUE_SETTING = "limits/debugger/max_queued_messages", QUEUE_DEFAULT = 2048, QUEUE_HEADROOM = 512, UNNAMED_PREFIX = "#", ms = (seconds) => Math.round(seconds * 1e6) / 1000, RUNTIME_SCRIPT = "gdharness_runtime/runtime_autoload.gd", PROFILER_PROBE = "_profiler_probe", PROFILER_CALIBRATOR = "_calibrate_the_profiler", CALL_SITES = 40;
+var QUEUE_SETTING = "limits/debugger/max_queued_messages", QUEUE_DEFAULT = 2048, QUEUE_HEADROOM = 512, UNNAMED_PREFIX = "#", PROFILE_FROM_START = "GDHARNESS_PROFILE_FROM_START", ms = (seconds) => Math.round(seconds * 1e6) / 1000, RUNTIME_SCRIPT = "gdharness_runtime/runtime_autoload.gd", PROFILER_PROBE = "_profiler_probe", PROFILER_CALIBRATOR = "_calibrate_the_profiler", CALL_SITES = 40;
 var init_script_profile = __esm(() => {
   init_gdscript_source();
   init_godot_variant();
@@ -42740,7 +42740,7 @@ import {
   fstatSync,
   mkdirSync as mkdirSync15,
   openSync as openSync3,
-  readdirSync as readdirSync10,
+  readdirSync as readdirSync11,
   readFileSync as readFileSync23,
   readSync as readSync2,
   rmdirSync as rmdirSync2,
@@ -43624,7 +43624,7 @@ function elsewhereIn(projectPath, asked) {
   const root = (wanted.split("/")[0] ?? "").toLowerCase();
   let near = [];
   try {
-    near = readdirSync10(projectPath, { withFileTypes: true }).filter((entry) => entry.isDirectory() && entry.name.toLowerCase() !== root).map((entry) => entry.name).filter((name) => name.toLowerCase().startsWith("test") || root.startsWith(name.toLowerCase()));
+    near = readdirSync11(projectPath, { withFileTypes: true }).filter((entry) => entry.isDirectory() && entry.name.toLowerCase() !== root).map((entry) => entry.name).filter((name) => name.toLowerCase().startsWith("test") || root.startsWith(name.toLowerCase()));
   } catch {
     return "";
   }
@@ -43718,7 +43718,7 @@ function scriptsUnder(directory, prefix) {
     return [];
   }
   const found = [];
-  for (const entry of readdirSync10(directory, { withFileTypes: true }).sort((a, b) => a.name < b.name ? -1 : 1)) {
+  for (const entry of readdirSync11(directory, { withFileTypes: true }).sort((a, b) => a.name < b.name ? -1 : 1)) {
     if (entry.name.startsWith(".")) {
       continue;
     }
@@ -45393,7 +45393,7 @@ class GodotServer {
     let report = null;
     let reportProblem = null;
     try {
-      const written = existsSync20(reportsDir) ? readdirSync10(reportsDir).filter((name) => name.startsWith("report_")).sort((a, b) => Number(a.slice("report_".length)) - Number(b.slice("report_".length))) : [];
+      const written = existsSync20(reportsDir) ? readdirSync11(reportsDir).filter((name) => name.startsWith("report_")).sort((a, b) => Number(a.slice("report_".length)) - Number(b.slice("report_".length))) : [];
       const newest = written.at(-1);
       if (newest !== undefined) {
         report = parseJUnit(readFileSync23(join26(reportsDir, newest, "results.xml"), "utf8"));
@@ -46929,10 +46929,11 @@ class GodotServer {
     const startedAt = Date.now();
     const transcript = openTranscript(startedAt);
     closeSync2(transcript.fd);
+    const gameEnv = profiled ? { ...env ?? process.env, [PROFILE_FROM_START]: "1" } : env;
     const launched = await launchOutsideTheTree({
       command: godotPath,
       args: cmdArgs,
-      ...env === undefined ? {} : { env },
+      ...gameEnv === undefined ? {} : { env: gameEnv },
       run: {
         transcript: transcript.path,
         startedAt,
@@ -48822,7 +48823,7 @@ import { existsSync as existsSync21 } from "node:fs";
 import { join as join27, resolve as resolve8 } from "node:path";
 
 // src/harnesses.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync2, rmSync as rmSync2, statSync as statSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync2, readdirSync as readdirSync2, readFileSync as readFileSync2, rmSync as rmSync2, statSync as statSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { basename as basename2, dirname as dirname3, join as join4, relative as relative2, resolve as resolve2 } from "node:path";
 import process4 from "node:process";
@@ -49569,6 +49570,30 @@ function mainCheckoutOf(projectPath) {
   const main = join4(dirname3(common), relative2(top, resolve2(projectPath)));
   return isSameDirectory(main, projectPath) || !existsSync4(join4(main, "project.godot")) ? null : main;
 }
+function worktreeCheckoutsOf(projectPath) {
+  let top = resolve2(projectPath);
+  while (!existsSync4(join4(top, ".git"))) {
+    const up = dirname3(top);
+    if (up === top) {
+      return [];
+    }
+    top = up;
+  }
+  const listed = join4(top, ".git", "worktrees");
+  if (!statSync2(join4(top, ".git")).isDirectory() || !existsSync4(listed)) {
+    return [];
+  }
+  const below = relative2(top, resolve2(projectPath));
+  return readdirSync2(listed).flatMap((name) => {
+    const pointer = join4(listed, name, "gitdir");
+    if (!existsSync4(pointer)) {
+      return [];
+    }
+    const checkout = dirname3(resolve2(listed, name, readFileSync2(pointer, "utf8").trim()));
+    const project = join4(checkout, below);
+    return existsSync4(join4(project, "project.godot")) ? [project] : [];
+  });
+}
 function entryEnvironment(harness, projectPath) {
   if (harness.toml || harness.yaml || harness.snippet) {
     return;
@@ -49760,7 +49785,7 @@ init_setup();
 init_setup();
 init_tool_definitions();
 init_tool_reference();
-import { existsSync as existsSync11, mkdirSync as mkdirSync5, readdirSync as readdirSync5, rmSync as rmSync6, writeFileSync as writeFileSync7 } from "node:fs";
+import { existsSync as existsSync11, mkdirSync as mkdirSync5, readdirSync as readdirSync6, rmSync as rmSync6, writeFileSync as writeFileSync7 } from "node:fs";
 import { basename as basename4, dirname as dirname6, join as join11 } from "node:path";
 var SKILL_NAME = "gdharness";
 var SHARED_SKILLS = join11(".agents", "skills");
@@ -50007,7 +50032,7 @@ function pruneEmpty(directory, projectPath) {
   const shared = join11(projectPath, ".agents");
   let path = directory;
   while (path !== projectPath && (basename4(path) === "skills" || path === shared)) {
-    if (readdirSync5(path).length > 0) {
+    if (readdirSync6(path).length > 0) {
       return;
     }
     rmSync6(path, { recursive: true, force: true });
@@ -50360,6 +50385,17 @@ On ${version}. What is left for you:`);
 ` + "     editor_launch restart tool, which closes and reopens the window.");
   const serving = await serverServing(projectPath);
   console.log(harnessNote({ moved, written, byHand }, [launch.command, ...launch.args].join(" "), serving === null ? null : { server: serving, isThisVersion: serving.version === version }));
+  const trailing = worktreeCheckoutsOf(projectPath).flatMap((path) => {
+    const addon = inspectProject(path).addons.find((one) => one.installed);
+    return addon === undefined || addon.version === version ? [] : [{ path, version: addon.version }];
+  });
+  if (trailing.length > 0) {
+    console.log(`
+Git worktrees of this project keep untracked addons of their own, which this upgrade does not reach:`);
+    for (const worktree of trailing) {
+      console.log(`  ${worktree.path}: ${worktree.version ?? "an unmarked copy"}. Run  gdharness upgrade ${worktree.path}`);
+    }
+  }
 }
 function doctorReport(projectPath) {
   const report = inspectProject(projectPath);

package/build/godot/addons/gdharness_editor/tools/profile_tools.gd

@@ -22,6 +22,9 @@ const DEBUGGER_CLASS: String = "ScriptEditorDebugger"
 const PROFILE_CAPTURE: String = "gdharness"
 const PROFILE_SENT: String = "gdharness:profile_sent"
 const PROFILE_RECEIVED: String = "gdharness:profile_received"
+## Set in the environment a played game inherits, when the play is to be profiled from its start.
+## Kept in step with the runtime addon's runtime_autoload.gd.
+const PROFILE_FROM_START: String = "GDHARNESS_PROFILE_FROM_START"
 
 
 ## The editor's debugger sessions, numbered as the editor numbers its debugger tabs.
@@ -106,6 +109,10 @@ func profile_start(args: Dictionary) -> Dictionary:
 	_frame_functions = asked if asked > 0 else FRAME_FUNCTIONS
 	if Read.as_bool(args.get("arm", false)):
 		_armed = true
+		# The game the editor starts next inherits the editor's environment, and this tells its
+		# runtime addon to hold its start until the profiler is on, which the session's start
+		# switches on with a message the game reads only on a later poll.
+		OS.set_environment(PROFILE_FROM_START, "1")
 		return {"ok": true, "started": false, "armed": true, "session": -1}
 	var active: int = _active_session()
 	if active < 0:
@@ -137,6 +144,7 @@ func profile_read(_args: Dictionary) -> Dictionary:
 
 func _reset() -> void:
 	_armed = false
+	OS.unset_environment(PROFILE_FROM_START)
 	_session = -1
 	_frames = 0
 	_complete = false
@@ -172,6 +180,8 @@ func _on_session_started(session_id: int) -> void:
 		_reset()
 		return
 	_armed = false
+	# The game has started with it by now, and a later play must not.
+	OS.unset_environment(PROFILE_FROM_START)
 	if _hook() > 0:
 		_switch_on(session_id)
 

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

@@ -47,6 +47,13 @@ const PROFILER_PROBE_CALLS: int = 10000
 ## on every 2048th call and only counts the others.
 const POLLS_PER_READ: int = 2048
 
+## Set in a game's environment by whatever starts it to be profiled from its start: the server for
+## a run it spawns, the editor for a play. Kept in step with `PROFILE_FROM_START` in the server.
+const PROFILE_FROM_START: String = "GDHARNESS_PROFILE_FROM_START"
+
+## How long such a game waits for its debugger to switch the profiler on before carrying on.
+const PROFILER_WAIT_MS: int = 5000
+
 ## How the engine is told to run a script instead of the game: `godot -s thing.gd`.
 const SCRIPT_FLAGS: PackedStringArray = ["-s", "--script"]
 
@@ -134,6 +141,37 @@ func _init() -> void:
 		"wait_signal": _waits.wait_signal,
 		"wait_until": _waits.wait_until,
 	}
+	_wait_for_the_profiler()
+
+
+## Holds the game's start until the profiler is on, when whatever started the game asked for a
+## profile from its start. The debugger switches the profiler on with a message the game reads only
+## on a poll, which comes every [constant POLLS_PER_READ] lines of script, so the main scene's _ready
+## could run first: a game played on a macOS runner counted 25 calls of a function called 26 times,
+## the first of them from _ready. Run at the autoload's construction, before the main scene loads.
+func _wait_for_the_profiler() -> void:
+	if OS.get_environment(PROFILE_FROM_START).is_empty():
+		return
+	# Read once: a process this game starts inherits its environment and must not wait as well.
+	OS.unset_environment(PROFILE_FROM_START)
+	if not EngineDebugger.is_active():
+		return
+	var deadline: int = Time.get_ticks_msec() + PROFILER_WAIT_MS
+	while not EngineDebugger.is_profiling("servers"):
+		if Time.get_ticks_msec() >= deadline:
+			push_warning(
+				(
+					(
+						"gdharness: this game was started to be profiled from its start, and the profiler"
+						+ " was not on %d ms later, so what ran before it is not counted"
+					)
+					% PROFILER_WAIT_MS
+				)
+			)
+			return
+		for _poll: int in POLLS_PER_READ:
+			EngineDebugger.line_poll()
+		OS.delay_msec(1)
 
 
 func _ready() -> void:

package/build/index.js

@@ -33393,6 +33393,7 @@ function queuedMessagesOf(projectGodot) {
   return typeof set === "number" && Number.isInteger(set) && set > 0 ? set : QUEUE_DEFAULT;
 }
 var UNNAMED_PREFIX = "#";
+var PROFILE_FROM_START = "GDHARNESS_PROFILE_FROM_START";
 function signatureParts(signature) {
   const parts = signature.split("::");
   if (parts.length < 3) {
@@ -39426,10 +39427,11 @@ class GodotServer {
     const startedAt = Date.now();
     const transcript = openTranscript(startedAt);
     closeSync2(transcript.fd);
+    const gameEnv = profiled ? { ...env ?? process.env, [PROFILE_FROM_START]: "1" } : env;
     const launched = await launchOutsideTheTree({
       command: godotPath,
       args: cmdArgs,
-      ...env === undefined ? {} : { env },
+      ...gameEnv === undefined ? {} : { env: gameEnv },
       run: {
         transcript: transcript.path,
         startedAt,

package/package.json

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