gdharness 1.0.2 → 1.0.3

package/build/index.js

@@ -10183,7 +10183,7 @@ import {
   readSync
 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
-import { basename as basename3, dirname as dirname6, join as join13, normalize as normalize2, relative as relative3 } from "node:path";
+import { basename as basename3, dirname as dirname7, join as join13, normalize as normalize2, relative as relative3 } from "node:path";
 import { setTimeout as delay3 } from "node:timers/promises";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { promisify as promisify5 } from "node:util";
@@ -27713,20 +27713,61 @@ async function handleLSPTool(client, toolName, args) {
 }
 
 // src/process-children.ts
-import { execFile as execFile3 } from "node:child_process";
+import { execFile as execFile3, execFileSync, spawnSync } from "node:child_process";
 import { basename } from "node:path";
 import { promisify as promisify3 } from "node:util";
 var run3 = promisify3(execFile3);
+function startTimesOf(pids) {
+  const began = new Map;
+  if (pids.length === 0) {
+    return began;
+  }
+  try {
+    if (process.platform === "win32") {
+      const filter = pids.map((pid) => `ProcessId=${pid}`).join(" OR ");
+      const said = execFileSync("powershell", [
+        "-NoProfile",
+        "-NonInteractive",
+        "-Command",
+        `Get-CimInstance Win32_Process -Filter "${filter}" | ForEach-Object { "$($_.ProcessId) $(([DateTimeOffset]$_.CreationDate).ToUnixTimeMilliseconds())" }`
+      ], { encoding: "utf8", timeout: ASK_TIMEOUT_MS, windowsHide: true });
+      for (const line of said.split(`
+`)) {
+        const found = /^\s*(\d+)\s+(\d+)\s*$/.exec(line);
+        if (found?.[1] !== undefined && found[2] !== undefined) {
+          began.set(Number(found[1]), Number(found[2]));
+        }
+      }
+      return began;
+    }
+    const said = spawnSync("ps", ["-p", pids.join(","), "-o", "pid=,lstart="], {
+      encoding: "utf8",
+      timeout: ASK_TIMEOUT_MS,
+      env: { ...process.env, LC_ALL: "C" }
+    }).stdout;
+    for (const line of said.split(`
+`)) {
+      const found = /^\s*(\d+)\s+(.+)$/.exec(line);
+      const at = Date.parse(found?.[2]?.trim() ?? "");
+      if (found?.[1] !== undefined && !Number.isNaN(at)) {
+        began.set(Number(found[1]), at);
+      }
+    }
+  } catch {}
+  return began;
+}
 var ASK_TIMEOUT_MS = 15000;
 async function processTree() {
   try {
-    const printed = process.platform === "win32" ? await askWindows() : await askPosix();
-    return parseProcessTable(printed);
+    if (process.platform === "win32") {
+      return parseProcessTable(await askWindows(), true);
+    }
+    return parseProcessTable(await askPosix());
   } catch {
     return;
   }
 }
-function parseProcessTable(printed) {
+function parseProcessTable(printed, started = false) {
   const tree = new Map;
   for (const line of printed.split(/\r?\n/)) {
     const fields = /^\s*(\d+)\s+(\d+)(?:\s+(.*))?$/.exec(line);
@@ -27735,16 +27776,38 @@ function parseProcessTable(printed) {
     }
     const pid = Number(fields[1]);
     const parent = Number(fields[2]);
-    if (pid > 0) {
-      tree.set(pid, { parent, command: (fields[3] ?? "").trim() });
+    const rest = (fields[3] ?? "").trim();
+    if (pid <= 0) {
+      continue;
     }
+    if (!started) {
+      tree.set(pid, { parent, command: rest });
+      continue;
+    }
+    const timed = /^(\d+)(?:\s+(.*))?$/.exec(rest);
+    if (timed === null) {
+      continue;
+    }
+    const began = Number(timed[1]);
+    tree.set(pid, { parent, command: (timed[2] ?? "").trim(), ...began > 0 ? { startedAt: began } : {} });
   }
   return tree;
 }
+function linked(tree, child, parent) {
+  const from = tree.get(child);
+  const to = tree.get(parent);
+  if (from === undefined || from.parent !== parent) {
+    return false;
+  }
+  if (from.startedAt === undefined || to?.startedAt === undefined) {
+    return true;
+  }
+  return from.startedAt >= to.startedAt;
+}
 function childrenIn(tree, pid) {
   const children = [];
-  for (const [child, listed] of tree) {
-    if (listed.parent === pid) {
+  for (const child of tree.keys()) {
+    if (linked(tree, child, pid)) {
       children.push(child);
     }
   }
@@ -27772,13 +27835,15 @@ function descendantsIn(tree, pid) {
 function ancestorsIn(tree, pid, root) {
   const chain = [];
   const seen = new Set([pid]);
+  let child = pid;
   let parent = tree.get(pid)?.parent;
-  while (parent !== undefined && !seen.has(parent)) {
+  while (parent !== undefined && !seen.has(parent) && linked(tree, child, parent)) {
     chain.push(parent);
     if (parent === root) {
       break;
     }
     seen.add(parent);
+    child = parent;
     parent = tree.get(parent)?.parent;
   }
   return chain;
@@ -27834,7 +27899,7 @@ async function askWindows() {
     "-NoProfile",
     "-NonInteractive",
     "-Command",
-    'Get-CimInstance Win32_Process | ForEach-Object { "$($_.ProcessId) $($_.ParentProcessId) $($_.CommandLine)" }'
+    'Get-CimInstance Win32_Process | 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;
 }
@@ -28292,7 +28357,7 @@ function restartSettled(projectPath) {
 }
 
 // src/run-record.ts
-import { execFileSync } from "node:child_process";
+import { execFileSync as execFileSync2 } from "node:child_process";
 import { mkdirSync as mkdirSync5, openSync, readdirSync as readdirSync5, readFileSync as readFileSync11, rmSync as rmSync5, statSync as statSync4, writeFileSync as writeFileSync6 } from "node:fs";
 import { basename as basename2, join as join11 } from "node:path";
 
@@ -28300,7 +28365,7 @@ import { basename as basename2, join as join11 } from "node:path";
 import { existsSync as existsSync7, readdirSync as readdirSync4, readFileSync as readFileSync10, statSync as statSync3, unlinkSync } from "node:fs";
 import { createConnection as createConnection3 } from "node:net";
 import { tmpdir as tmpdir3 } from "node:os";
-import { join as join10, resolve as resolve4 } from "node:path";
+import { dirname as dirname5, join as join10, resolve as resolve4 } from "node:path";
 import { setTimeout as delay2 } from "node:timers/promises";
 
 // src/tool-args.ts
@@ -28474,11 +28539,35 @@ function announcedAndGone(projectPath) {
   const wanted = resolve4(projectPath);
   return gone.filter((one) => one.noticedAt >= since && resolve4(one.project) === wanted);
 }
+var STARTED_AFTER_ANNOUNCING_MS = 2000;
+var CONFIRMED_FOR_MS = 60000;
+var JUDGED_AFTER_MS = 60000;
+var verdicts = new Map;
+function strangersAmong(candidates, now, startTimes = startTimesOf) {
+  const toJudge = candidates.filter((one) => {
+    if (now - one.writtenAt < JUDGED_AFTER_MS) {
+      return false;
+    }
+    const known = verdicts.get(one.file);
+    return known === undefined || known.writtenAt !== one.writtenAt || !known.stranger && now - known.judgedAt > CONFIRMED_FOR_MS;
+  });
+  if (toJudge.length > 0) {
+    const began = startTimes(toJudge.map((one) => one.pid));
+    for (const one of toJudge) {
+      const at = began.get(one.pid);
+      const stranger = at !== undefined && at - one.writtenAt > STARTED_AFTER_ANNOUNCING_MS;
+      verdicts.set(one.file, { writtenAt: one.writtenAt, judgedAt: now, stranger });
+    }
+  }
+  return new Set(candidates.filter((one) => verdicts.get(one.file)?.stranger === true).map((one) => one.file));
+}
 function announcedIn(directory) {
   if (!existsSync7(directory)) {
     return [];
   }
   const found = [];
+  const candidates = [];
+  const entries = [];
   for (const entry of readdirSync4(directory)) {
     const report = ERROR_REPORT_PATTERN.exec(entry);
     if (report) {
@@ -28492,20 +28581,60 @@ function announcedIn(directory) {
     const file = join10(directory, entry);
     const pid = Number.parseInt(match[1] ?? "", 10);
     const alive = processAlive(pid);
-    const announced = alive ? parseAnnouncement(file, pid) : { kind: "rubbish" };
+    entries.push({ file, pid, alive });
+    if (alive) {
+      try {
+        candidates.push({ file, pid, writtenAt: statSync3(file).mtimeMs });
+      } catch {}
+    }
+  }
+  const strangers = strangersAmong(candidates, Date.now());
+  for (const { file, pid, alive } of entries) {
+    const announced = alive && !strangers.has(file) ? parseAnnouncement(file, pid) : { kind: "rubbish" };
     if (announced.kind === "rubbish") {
-      if (!alive) {
+      if (!alive || strangers.has(file)) {
         wentAway(file, pid);
       }
       try {
         unlinkSync(file);
       } catch {}
+      verdicts.delete(file);
       continue;
     }
     found.push(announced);
   }
+  const held = new Set(entries.map((one) => one.file));
+  const here = join10(directory, ".");
+  for (const file of verdicts.keys()) {
+    if (dirname5(file) === here && !held.has(file)) {
+      verdicts.delete(file);
+    }
+  }
   return found;
 }
+var ENDED_WITHIN_MS = 3000;
+async function announcementEnded(pid, directories = runtimeDirectories()) {
+  const files = directories.map((directory) => join10(directory, `runtime-${pid}.json`)).filter((file) => existsSync7(file));
+  const first = files[0];
+  if (first === undefined) {
+    return;
+  }
+  const until = Date.now() + ENDED_WITHIN_MS;
+  while (processAlive(pid)) {
+    const left = until - Date.now();
+    if (left <= 0) {
+      return;
+    }
+    await delay2(Math.min(LOOK_EVERY_MS, left));
+  }
+  wentAway(first, pid);
+  for (const file of files) {
+    try {
+      unlinkSync(file);
+    } catch {}
+    verdicts.delete(file);
+  }
+}
 function sweepErrorReport(path, pid, now = Date.now()) {
   if (processAlive(pid)) {
     return;
@@ -28814,7 +28943,7 @@ function runningAs(pid) {
       const raw = readFileSync11(`/proc/${pid}/cmdline`, "utf8").replaceAll("\x00", " ").trim();
       return raw === "" ? null : { kind: "commandLine", text: raw, ...when };
     }
-    const args = execFileSync("ps", ["-p", String(pid), "-o", "args="], {
+    const args = execFileSync2("ps", ["-p", String(pid), "-o", "args="], {
       encoding: "utf8",
       timeout: 15000
     }).trim();
@@ -28826,20 +28955,14 @@ function runningAs(pid) {
 function listeningPid(port) {
   try {
     if (process.platform === "win32") {
-      const said = execFileSync("powershell", [
-        "-NoProfile",
-        "-NonInteractive",
-        "-Command",
-        `(Get-NetTCPConnection -State Listen -LocalPort ${port} -ErrorAction SilentlyContinue | Select-Object -First 1).OwningProcess`
-      ], { encoding: "utf8", timeout: 15000 }).trim();
-      return /^\d+$/.test(said) ? Number(said) : null;
+      return listeningPidInNetstat(execFileSync2("netstat", ["-ano"], { encoding: "utf8", timeout: 15000 }), port);
     }
     for (const [command, args, pattern] of [
       ["lsof", ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"], /^(\d+)/],
       ["ss", ["-ltnpH", `sport = :${port}`], /pid=(\d+)/]
     ]) {
       try {
-        const said = execFileSync(command, [...args], { encoding: "utf8", timeout: 15000 }).trim();
+        const said = execFileSync2(command, [...args], { encoding: "utf8", timeout: 15000 }).trim();
         const found = pattern.exec(said);
         if (found?.[1] !== undefined) {
           return Number(found[1]);
@@ -28851,9 +28974,22 @@ function listeningPid(port) {
     return null;
   }
 }
+function listeningPidInNetstat(printed, port) {
+  for (const line of printed.split(/\r?\n/)) {
+    const fields = /^\s*TCP\s+(\S+)\s+\S+\s+LISTENING\s+(\d+)\s*$/i.exec(line);
+    if (fields === null) {
+      continue;
+    }
+    const local = fields[1] ?? "";
+    if (Number(local.slice(local.lastIndexOf(":") + 1)) === port) {
+      return Number(fields[2]);
+    }
+  }
+  return null;
+}
 function windowsCommandLine(pid) {
   try {
-    const answer = execFileSync("powershell", [
+    const answer = execFileSync2("powershell", [
       "-NoProfile",
       "-NonInteractive",
       "-Command",
@@ -28871,7 +29007,7 @@ function startedAt(pid, windowsAnswer) {
     return Number.isNaN(when) ? null : when;
   }
   try {
-    const said = execFileSync("ps", ["-p", String(pid), "-o", "lstart="], {
+    const said = execFileSync2("ps", ["-p", String(pid), "-o", "lstart="], {
       encoding: "utf8",
       timeout: 15000
     }).trim();
@@ -28883,7 +29019,7 @@ function startedAt(pid, windowsAnswer) {
 }
 function windowsImage(pid) {
   try {
-    const csv = execFileSync("tasklist", ["/FI", `PID eq ${pid}`, "/FO", "CSV", "/NH"], {
+    const csv = execFileSync2("tasklist", ["/FI", `PID eq ${pid}`, "/FO", "CSV", "/NH"], {
       encoding: "utf8",
       timeout: 15000,
       windowsHide: true
@@ -28969,7 +29105,7 @@ function sweepTranscripts(keepMs = 24 * 60 * 60 * 1000, now = Date.now()) {
 
 // src/setup.ts
 import { cpSync, existsSync as existsSync8, mkdirSync as mkdirSync6, readFileSync as readFileSync12, rmSync as rmSync6, writeFileSync as writeFileSync7 } from "node:fs";
-import { dirname as dirname5, join as join12 } from "node:path";
+import { dirname as dirname6, join as join12 } from "node:path";
 var ADDONS = ["gdharness_editor", "gdharness_runtime", "auto_reload"];
 var RUNTIME_AUTOLOAD = {
   name: "GdharnessRuntime",
@@ -29758,7 +29894,7 @@ var TOOL_SPECS = [
       property: {
         type: "string",
         ops: ["property", "find"],
-        description: 'property: which one to read. find: read this one off every node matched, so a panel of labels is one call rather than one per label. Colons read through what a node holds, "_game:clock:speed", which is where a game keeps what is worth asking about. A number or a key steps into a list or a map, "_game:run:roster:0:traits", which is how the lists a game keeps its state in are walked: a roster, a board, an in-tray. A negative number counts from the end. A step that is not there is named, and says what was there instead.'
+        description: 'property: which one to read. find: read this one off every node matched, so a panel of labels is one call rather than one per label. Colons read through what a node holds, "_game:clock:speed", which is where a game keeps what is worth asking about. A number or a key steps into a list or a map, "_game:run:roster:0:traits", which is how the lists a game keeps its state in are walked: a roster, a board, an in-tray. A negative number counts from the end. A step written as a call, "get_viewport():gui_get_focus_owner()", calls a method that takes no arguments and walks into what it returned, which is how a question only a method answers is read in one call: which control holds the focus in the viewport this one is in. A step that is not there is named, and says what was there instead.'
       },
       depth: { type: "number", ops: ["tree"], description: "tree: levels to descend. Default 3." },
       includeProperties: {
@@ -29839,7 +29975,7 @@ var TOOL_SPECS = [
       property: {
         type: "string",
         ops: ["set"],
-        description: 'set: which one to write. Colons write through what a node holds, "_game:run:day", and a number or a key steps into a list or a map on the way, "_game:run:roster:0:name", a negative number counting from the end. The answer reads back off the same holder, so a write a typed container refused shows as an unchanged value.'
+        description: 'set: which one to write. Colons write through what a node holds, "_game:run:day", and a number or a key steps into a list or a map on the way, "_game:run:roster:0:name", a negative number counting from the end, and a step written as a call, "get_viewport():gui_embed_subwindows", walks through what a method taking no arguments returned. The answer reads back off the same holder, so a write a typed container refused shows as an unchanged value.'
       },
       value: {
         ops: ["set"],
@@ -29849,7 +29985,7 @@ var TOOL_SPECS = [
       method: {
         type: "string",
         ops: ["call"],
-        description: 'call: which one to call. Colons call through what a node holds, "_game:run:advance", the same way a property is written through them, and a list or a map is stepped into by index or key, "_game:run:roster:0:retire".'
+        description: 'call: which one to call. Colons call through what a node holds, "_game:run:advance", the same way a property is written through them, a list or a map is stepped into by index or key, "_game:run:roster:0:retire", and a step written as a call walks through what a method taking no arguments returned, "get_viewport():gui_get_focus_owner".'
       },
       args: {
         type: "array",
@@ -29909,7 +30045,7 @@ var TOOL_SPECS = [
       pressed: {
         type: "boolean",
         ops: ["action", "key", "mouse_click"],
-        description: "action, key: leave it out and the press is a whole one, down and up a frame apart. true holds it down, false lets go of one being held. mouse_click is one raw event, so it is down unless you say false."
+        description: "action, key: leave it out and the press is a whole one, down and up a frame apart. true holds it down, false lets go of one being held. mouse_click is one raw event, so it is down unless you say false; a wheel button down is a whole step, since a wheel is never held."
       },
       strength: { type: "number", ops: ["action"], description: "action: 0 to 1. Default 1." },
       keycode: {
@@ -29987,7 +30123,7 @@ var TOOL_SPECS = [
         requires: ["text"]
       },
       mouse_click: {
-        summary: "one mouse button event at a position, carrying the buttons held once it has happened. A drag is a press held with pressed true, motions, and a release with pressed false",
+        summary: "one mouse button event at a position, carrying the buttons held once it has happened. A drag is a press held with pressed true, motions, and a release with pressed false. A wheel button is a whole step, press and release together as a mouse sends one, and the answer says released: a lone wheel press holds the viewport on the control that took it, so every click after it lands there",
         requires: ["x", "y"]
       },
       mouse_motion: {
@@ -30009,7 +30145,11 @@ var TOOL_SPECS = [
       },
       nodePath: { type: "string", ops: ["signal", "until"], description: "signal, until: the node." },
       signal: { type: "string", ops: ["signal"], description: "signal: the signal name." },
-      property: { type: "string", ops: ["until"], description: "until: the property name." },
+      property: {
+        type: "string",
+        ops: ["until"],
+        description: 'until: the property name, or a colon path through what the node holds, "_game:run:day", read the way runtime_inspect property reads one, a step written as a call included. Walked again on every frame, so a holder the game replaces while the wait is on is followed.'
+      },
       value: { ops: ["until"], description: "until: the value to wait for, fitted to the property's type." },
       says: {
         type: "string",
@@ -30134,7 +30274,7 @@ function buildToolDefinitions() {
 var UPDATE_NOTICE_EVERY = 500;
 var FEEDBACK_NOTICE_EVERY = 250;
 var run5 = promisify5(execFile5);
-var __dirname2 = dirname6(fileURLToPath2(import.meta.url));
+var __dirname2 = dirname7(fileURLToPath2(import.meta.url));
 var EDITOR_RESTART_TIMEOUT_MS = 90000;
 var HOLD_PING_MS = 2000;
 var SLOWEST_FRAME_RATE = 20;
@@ -31396,11 +31536,11 @@ class GodotServer {
     if (!engine.ok) {
       return engine.response;
     }
-    const folder = dirname6(output.absolutePath);
+    const folder = dirname7(output.absolutePath);
     try {
       mkdirSync7(folder, { recursive: true });
     } catch (error) {
-      return this.createErrorResponse(`Cannot create ${dirname6(output.relativePath)} to export into: ${errorMessage(error)}`);
+      return this.createErrorResponse(`Cannot create ${dirname7(output.relativePath)} to export into: ${errorMessage(error)}`);
     }
     const debug = readBoolean(args, "debug") ?? false;
     const exportLogs = mkdtempSync2(join13(tmpdir4(), "gdharness-export-"));
@@ -31854,11 +31994,14 @@ class GodotServer {
       return null;
     }
     try {
-      const answer = await Promise.race([
-        this.godotBridge.invokeTool("playing_status", {}),
-        delay3(PLAYING_STATUS_MS).then(() => null)
-      ]);
+      const askedAt = Date.now();
+      const asked = this.godotBridge.invokeTool("playing_status", {});
+      const answer = await Promise.race([asked, delay3(PLAYING_STATUS_MS).then(() => null)]);
       if (answer === null) {
+        this.logDebug(`playing_status did not answer within ${PLAYING_STATUS_MS}ms`);
+        asked.then(() => {
+          this.logDebug(`playing_status answered after ${Date.now() - askedAt}ms`);
+        }).catch(() => {});
         return null;
       }
       return {
@@ -32178,6 +32321,9 @@ class GodotServer {
     let asking = null;
     let editorAskedAt = 0;
     let editorSaysGoing = true;
+    let editorAsks = 0;
+    const waitBegan = Date.now();
+    const lastSaid = () => editorSaysGoing ? "playing" : "not playing";
     const endpoint = await announcedSince(projectPath, before, {
       budgetMs,
       accept: (one) => this.isTheGameOf(this.currentRun(), one, projectPath),
@@ -32191,6 +32337,7 @@ class GodotServer {
         }
         if (asking === null && Date.now() - editorAskedAt >= RUN_POLL_MS) {
           editorAskedAt = Date.now();
+          editorAsks += 1;
           asking = this.runStillGoing(run).then((going) => {
             editorSaysGoing = going;
           }).finally(() => {
@@ -32200,6 +32347,7 @@ class GodotServer {
         return !editorSaysGoing;
       }
     });
+    this.logDebug(`announce wait ended after ${Date.now() - waitBegan}ms: ${endpoint === null ? "nothing announced" : `pid ${endpoint.pid} announced`}, editor asked ${editorAsks} times, last said ${lastSaid()}`);
     const going = this.currentRun();
     if (endpoint !== null && going !== null && going.announcedPid === undefined) {
       going.announcedPid = endpoint.pid;
@@ -32876,11 +33024,19 @@ class GodotServer {
     this.drainEditorOutput(stopped);
     this.drainTranscript(stopped);
     const wasRunning = await this.runStillGoing(stopped);
-    const endedPid = stopped.pid ?? this.announcedPidOf(stopped) ?? null;
+    const announcedPid = this.announcedPidOf(stopped) ?? null;
+    const endedPid = stopped.pid ?? announcedPid;
     const children = readBoolean(args, "andChildren") === true && wasRunning ? await this.whatTheRunStarted(stopped) : null;
     this.logDebug("Stopping the running game");
     await this.endActiveGame("editor_run stop");
     const ended = children === null ? null : endChildrenAmong(children);
+    if (wasRunning) {
+      for (const pid of new Set([endedPid, announcedPid])) {
+        if (pid !== null) {
+          await announcementEnded(pid);
+        }
+      }
+    }
     return this.jsonTextResponse({
       stopped: true,
       through: stopped.throughEditor ? "editor" : "gdharness",

package/package.json

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