gdharness 1.3.4 → 1.3.5

package/build/keeper.js

@@ -3,9 +3,33 @@
 // src/keeper.ts
 import { closeSync as closeSync2, existsSync as existsSync3, mkdtempSync as mkdtempSync4, openSync as openSync3, readFileSync as readFileSync3, rmSync as rmSync6, writeFileSync as writeFileSync3 } from "node:fs";
 import { tmpdir as tmpdir5 } from "node:os";
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 import { setTimeout as delay2 } from "node:timers/promises";
 
+// src/alive.ts
+import process2 from "node:process";
+function exitOf(child) {
+  if (child.exitCode !== null || child.signalCode !== null) {
+    return Promise.resolve({ code: child.exitCode, signal: child.signalCode });
+  }
+  return new Promise((resolve) => {
+    child.once("exit", (code, signal) => {
+      resolve({ code, signal });
+    });
+  });
+}
+function alive(pid) {
+  if (pid === undefined || pid === null) {
+    return false;
+  }
+  try {
+    process2.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === "EPERM";
+  }
+}
+
 // src/desktop.ts
 import { createHash } from "node:crypto";
 import {
@@ -23,20 +47,6 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { setTimeout as delay } from "node:timers/promises";
 
-// src/alive.ts
-import process2 from "node:process";
-function alive(pid) {
-  if (pid === undefined || pid === null) {
-    return false;
-  }
-  try {
-    process2.kill(pid, 0);
-    return true;
-  } catch (error) {
-    return error.code === "EPERM";
-  }
-}
-
 // src/spawn.ts
 import {
   execFile,
@@ -1031,7 +1041,7 @@ class GameDebugger {
     }
     if (!held.hasStack) {
       this.forget("debug_enter");
-      this.send("next", [], held.thread);
+      this.send("step", [], held.thread);
       const again = await this.next(GameDebugger.named("debug_enter"), STEP_MS);
       if (again === null) {
         return {
@@ -1253,8 +1263,28 @@ function readLaunched(printed) {
 
 // src/run-record.ts
 import { createHash as createHash2 } from "node:crypto";
-import { mkdirSync, openSync as openSync2, readdirSync, readFileSync as readFileSync2, realpathSync, rmSync as rmSync4, statSync as statSync2 } from "node:fs";
-import { basename, dirname as dirname2, join as join4, resolve as resolve2 } from "node:path";
+import { mkdirSync, openSync as openSync2, readdirSync, readFileSync as readFileSync2, rmSync as rmSync4, statSync as statSync3 } from "node:fs";
+import { basename as basename2, join as join5, resolve as resolve3 } from "node:path";
+
+// src/paths.ts
+import { realpathSync, statSync as statSync2 } from "node:fs";
+import { basename, dirname, isAbsolute, join as join3, relative, resolve, sep } from "node:path";
+function realAsFarAsItExists(path) {
+  const missing = [];
+  let at = path;
+  for (;; ) {
+    try {
+      return join3(realpathSync.native(at), ...missing);
+    } catch {
+      const parent = dirname(at);
+      if (parent === at) {
+        return path;
+      }
+      missing.unshift(basename(at));
+      at = parent;
+    }
+  }
+}
 
 // src/windows-ask.ts
 var SCRIPT = [
@@ -1278,7 +1308,7 @@ var SCRIPT = [
 
 // src/runtime-client.ts
 import { tmpdir as tmpdir3 } from "node:os";
-import { dirname, join as join3, resolve } from "node:path";
+import { dirname as dirname2, join as join4, resolve as resolve2 } from "node:path";
 
 // src/launch.ts
 function envValue(name, variables = process.env) {
@@ -1323,7 +1353,7 @@ function runtimeDirectory(variables = process.env) {
     return explicit;
   }
   const perUser = envValue("XDG_RUNTIME_DIR", variables);
-  return join3(perUser ?? tmpdir3(), "gdharness");
+  return join4(perUser ?? tmpdir3(), "gdharness");
 }
 var ERROR_REPORT_KEEP_MS = 60 * 60 * 1000;
 var verdicts = new Map;
@@ -1363,31 +1393,15 @@ function writeWhole(path, text) {
 
 // src/run-record.ts
 function runsDirectory() {
-  return join4(runtimeDirectory(), "runs");
-}
-function realAsFarAsItExists(path) {
-  const missing = [];
-  let at = path;
-  for (;; ) {
-    try {
-      return join4(realpathSync.native(at), ...missing);
-    } catch {
-      const parent = dirname2(at);
-      if (parent === at) {
-        return path;
-      }
-      missing.unshift(basename(at));
-      at = parent;
-    }
-  }
+  return join5(runtimeDirectory(), "runs");
 }
 function projectKey(projectPath) {
-  const real = realAsFarAsItExists(resolve2(projectPath)).replace(/[\\/]+$/, "");
+  const real = realAsFarAsItExists(resolve3(projectPath)).replace(/[\\/]+$/, "");
   const folded = process.platform === "win32" || process.platform === "darwin" ? real.toLowerCase() : real;
   return createHash2("sha256").update(folded.replaceAll("\\", "/")).digest("hex").slice(0, 16);
 }
 function runRecordPath(projectPath, directory = runtimeDirectory()) {
-  return join4(directory, "runs", `note-${projectKey(projectPath)}.json`);
+  return join5(directory, "runs", `note-${projectKey(projectPath)}.json`);
 }
 function writeRunRecord(record) {
   mkdirSync(runsDirectory(), { recursive: true });
@@ -1454,14 +1468,14 @@ function recordAt(path) {
 // src/scratch.ts
 import { existsSync as existsSync2, mkdtempSync as mkdtempSync3, readdirSync as readdirSync2, rmSync as rmSync5 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
-import { join as join5 } from "node:path";
+import { join as join6 } from "node:path";
 import process4 from "node:process";
 var SWEPT = { recursive: true, force: true };
 var AGAIN_AFTER_MS = [250, 500, 1000, 2000, 4000, 8000, 16000];
 var waiting = new Set;
 var atExit = new Set;
 function scratchDirectory(kind) {
-  return mkdtempSync3(join5(tmpdir4(), `gdharness-${kind}-${process4.pid}-`));
+  return mkdtempSync3(join6(tmpdir4(), `gdharness-${kind}-${process4.pid}-`));
 }
 function discardWith(remove, paths) {
   const left = [];
@@ -1921,8 +1935,8 @@ async function startDirectly(spec, output, hidden, detached = true, errors = out
 }
 async function startThroughHelper(spec, output, stopFile) {
   const scratch = scratchDirectory("desktop");
-  const pidFile = join6(scratch, "pid");
-  const errorFile = join6(scratch, "error");
+  const pidFile = join7(scratch, "pid");
+  const errorFile = join7(scratch, "error");
   const where = spec.desktop === undefined ? "without activation" : `on the ${spec.desktop} desktop`;
   try {
     const compiled = await ensureHelperCompiled();
@@ -1930,7 +1944,7 @@ async function startThroughHelper(spec, output, stopFile) {
       return { error: `it could not be started ${where}: ${compiled}` };
     }
     const wrapper = throughHelper({ ...spec, directory: process.cwd() }, spec.command, spec.args, {
-      spec: join6(scratch, "spec.json"),
+      spec: join7(scratch, "spec.json"),
       pid: pidFile,
       error: errorFile,
       stop: stopFile
@@ -1974,7 +1988,7 @@ function profiledBy(path, projectPath) {
   };
   let projectGodot = null;
   try {
-    projectGodot = readFileSync3(join6(projectPath, "project.godot"), "utf8");
+    projectGodot = readFileSync3(join7(projectPath, "project.godot"), "utf8");
   } catch {}
   const observer = new ProfileObserver((totals) => {
     const first = latest === null;
@@ -2077,8 +2091,8 @@ async function keep() {
   const debuggerPeer = run === undefined || run.debugged === false ? null : await GameDebugger.open(run.breakpoints ?? [], profiled === null ? [] : [profiled.observer]);
   const toStart = debuggerPeer === null ? spec : { ...spec, args: withEngineArguments(spec.args, debuggerPeer.engineArguments) };
   const transcript = run === undefined ? "ignore" : openSync3(run.transcript, "a");
-  const own = run !== undefined && throughTheHelper(spec) ? mkdtempSync4(join6(tmpdir5(), "gdharness-stop-")) : null;
-  const stopFile = own === null ? "" : join6(own, "stop");
+  const own = run !== undefined && throughTheHelper(spec) ? mkdtempSync4(join7(tmpdir5(), "gdharness-stop-")) : null;
+  const stopFile = own === null ? "" : join7(own, "stop");
   let started;
   try {
     started = await startDetached(toStart, transcript, run === undefined, stopFile);
@@ -2108,26 +2122,8 @@ async function keep() {
   if (record !== null) {
     writeNoteIfItCan(record);
   }
+  const exited = exitOf(child);
   let listening = null;
-  child.once("exit", (code, signal) => {
-    const finish = () => {
-      profiled?.finish();
-      if (run !== undefined) {
-        recordRunEnded(run.projectPath, pid, { exitCode: code, exitSignal: code === null ? signal : null });
-      }
-      debuggerPeer?.close();
-      listening?.close();
-      if (own !== null) {
-        rmSync6(own, { recursive: true, force: true });
-      }
-      process.exit(0);
-    };
-    if (debuggerPeer === null) {
-      finish();
-    } else {
-      debuggerPeer.drained(DRAIN_MS).then(finish);
-    }
-  });
   if (record !== null) {
     listening = await listenForTheServer(() => {
       if (stopFile !== "") {
@@ -2140,9 +2136,27 @@ async function keep() {
       writeNoteIfItCan({ ...record, keeper: listening.address });
     }
   }
-  process.stdout.write(`pid ${pid}
-`);
-  process.stdout.end();
+  await new Promise((resolve) => {
+    process.stdout.once("error", () => {
+      resolve();
+    });
+    process.stdout.end(`pid ${pid}
+`, resolve);
+  });
+  const { code, signal } = await exited;
+  if (debuggerPeer !== null) {
+    await debuggerPeer.drained(DRAIN_MS);
+  }
+  profiled?.finish();
+  if (run !== undefined) {
+    recordRunEnded(run.projectPath, pid, { exitCode: code, exitSignal: code === null ? signal : null });
+  }
+  debuggerPeer?.close();
+  listening?.close();
+  if (own !== null) {
+    rmSync6(own, { recursive: true, force: true });
+  }
+  process.exit(0);
 }
 var mode = process.argv[2];
 if (mode === "launch") {

package/package.json

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