gdharness 1.2.30 → 1.2.32

package/build/keeper.js

@@ -1,14 +1,57 @@
 #!/usr/bin/env node
 
 // src/keeper.ts
-import { closeSync, existsSync as existsSync2, mkdtempSync as mkdtempSync3, openSync as openSync2, readFileSync as readFileSync2, rmSync as rmSync5, writeFileSync as writeFileSync3 } from "node:fs";
-import { tmpdir as tmpdir4 } from "node:os";
-import { join as join5 } from "node:path";
-import { setTimeout as delay } from "node:timers/promises";
+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 { setTimeout as delay2 } from "node:timers/promises";
 
 // src/desktop.ts
 import { createHash } from "node:crypto";
-import { writeFileSync } from "node:fs";
+import {
+  closeSync,
+  existsSync,
+  mkdtempSync,
+  openSync,
+  readFileSync,
+  rmSync,
+  statSync,
+  writeFileSync,
+  writeSync
+} from "node:fs";
+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,
+  execFileSync,
+  spawn,
+  spawnSync
+} from "node:child_process";
+function spawnHidden(command, args, options = {}) {
+  return spawn(command, [...args], { ...options, windowsHide: true });
+}
+function spawnShown(command, args, options = {}) {
+  return spawn(command, [...args], { ...options, windowsHide: false });
+}
+
+// src/desktop.ts
 var DESKTOP_VARIABLE = "GDHARNESS_DESKTOP";
 var SOURCE = `using System;
 using System.ComponentModel;
@@ -161,6 +204,95 @@ public static class GdharnessDesktop {
   }
 }
 `;
+var DIGEST = createHash("sha256").update(SOURCE).digest("hex").slice(0, 16);
+var HELPER_COMPILE_MS = 180000;
+function helperAssembly(directory = tmpdir()) {
+  return join(directory, `gdharness-desktop-${DIGEST}.dll`);
+}
+async function ensureHelperCompiled(directory = tmpdir(), budgetMs = HELPER_COMPILE_MS, wait = true) {
+  const assembly = helperAssembly(directory);
+  const lock = `${assembly}.compiling`;
+  const until = Date.now() + budgetMs;
+  while (Date.now() < until) {
+    if (existsSync(assembly)) {
+      return null;
+    }
+    let mine = false;
+    try {
+      const held = openSync(lock, "wx");
+      writeSync(held, String(process.pid));
+      closeSync(held);
+      mine = true;
+    } catch {}
+    if (mine) {
+      try {
+        return await compileHelper(directory, assembly, until - Date.now());
+      } finally {
+        rmSync(lock, { force: true });
+      }
+    }
+    try {
+      const holder = Number(readFileSync(lock, "utf8").trim());
+      const old = Date.now() - statSync(lock).mtimeMs > budgetMs;
+      if (old || Number.isInteger(holder) && holder > 0 && !alive(holder)) {
+        rmSync(lock, { force: true });
+        continue;
+      }
+    } catch {}
+    if (!wait) {
+      return null;
+    }
+    await delay(200);
+  }
+  return `the desktop helper was not compiled within ${String(budgetMs)} ms`;
+}
+async function compileHelper(directory, assembly, budgetMs) {
+  const scratch = mkdtempSync(join(directory, "gdharness-desktop-source-"));
+  const source = join(scratch, "helper.cs");
+  writeFileSync(source, SOURCE, "utf8");
+  const literal = (path) => `'${path.replaceAll("'", "''")}'`;
+  const script = [
+    "$ErrorActionPreference = 'Stop'",
+    "try {",
+    `  $partial = ${literal(assembly)} + '.' + $PID`,
+    `  Add-Type -TypeDefinition ([IO.File]::ReadAllText(${literal(source)}, [Text.Encoding]::UTF8)) -OutputAssembly $partial`,
+    `  Move-Item -LiteralPath $partial -Destination ${literal(assembly)}`,
+    "} catch {",
+    "  [Console]::Error.WriteLine($_.Exception.Message)",
+    "  exit 1",
+    "}"
+  ].join(`
+`);
+  try {
+    return await new Promise((resolve) => {
+      const compiler = spawnHidden("powershell.exe", [
+        "-NoProfile",
+        "-NonInteractive",
+        "-ExecutionPolicy",
+        "Bypass",
+        "-EncodedCommand",
+        Buffer.from(script, "utf16le").toString("base64")
+      ], { stdio: ["ignore", "ignore", "pipe"] });
+      let complained = "";
+      compiler.stderr.on("data", (chunk) => {
+        complained += chunk.toString();
+      });
+      const timer = setTimeout(() => {
+        compiler.kill();
+      }, budgetMs);
+      compiler.once("error", (error) => {
+        clearTimeout(timer);
+        resolve(`Windows PowerShell did not start: ${error.message}`);
+      });
+      compiler.once("close", (code) => {
+        clearTimeout(timer);
+        resolve(existsSync(assembly) ? null : `Windows PowerShell could not compile it${code === null ? " in time" : ""}: ${complained.trim() || `exit code ${String(code)}`}`);
+      });
+    });
+  } finally {
+    rmSync(scratch, { recursive: true, force: true });
+  }
+}
 function quoted(argument) {
   if (argument !== "" && !/[\s"]/.test(argument)) {
     return argument;
@@ -180,7 +312,7 @@ function quoted(argument) {
 function windowsCommandLine(command, args) {
   return [command, ...args].map(quoted).join(" ");
 }
-function throughHelper(how, command, args, files) {
+function throughHelper(how, command, args, files, assembly = helperAssembly()) {
   const spec = {
     desktop: how.desktop ?? "",
     noActivate: how.noActivate === true,
@@ -188,8 +320,7 @@ function throughHelper(how, command, args, files) {
     pidFile: files.pid,
     stopFile: files.stop,
     directory: how.directory,
-    source: SOURCE,
-    digest: createHash("sha256").update(SOURCE).digest("hex").slice(0, 16)
+    assembly
   };
   writeFileSync(files.spec, JSON.stringify(spec), "utf8");
   const literal = (path) => `'${path.replaceAll("'", "''")}'`;
@@ -197,13 +328,7 @@ function throughHelper(how, command, args, files) {
     "$ErrorActionPreference = 'Stop'",
     "try {",
     `  $spec = [IO.File]::ReadAllText(${literal(files.spec)}, [Text.Encoding]::UTF8) | ConvertFrom-Json`,
-    "  $assembly = Join-Path ([IO.Path]::GetTempPath()) ('gdharness-desktop-' + $spec.digest + '.dll')",
-    "  if (-not (Test-Path -LiteralPath $assembly)) {",
-    '    $partial = "$assembly.$PID"',
-    "    Add-Type -TypeDefinition $spec.source -OutputAssembly $partial",
-    "    try { Move-Item -LiteralPath $partial -Destination $assembly } catch { Remove-Item -LiteralPath $partial -ErrorAction SilentlyContinue }",
-    "  }",
-    "  Add-Type -LiteralPath $assembly",
+    "  Add-Type -LiteralPath $spec.assembly",
     "  $code = [GdharnessDesktop]::Run($spec.desktop, $spec.commandLine, $spec.pidFile, [bool]$spec.noActivate, $spec.stopFile, $spec.directory)",
     "} catch {",
     `  [IO.File]::WriteAllText(${literal(files.error)}, $_.Exception.Message)`,
@@ -1003,11 +1128,11 @@ class GameDebugger {
 
 // src/keeper-channel.ts
 import { randomUUID } from "node:crypto";
-import { mkdtempSync, rmSync } from "node:fs";
+import { mkdtempSync as mkdtempSync2, rmSync as rmSync2 } from "node:fs";
 import { connect, createServer as createServer2 } from "node:net";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import process2 from "node:process";
+import { tmpdir as tmpdir2 } from "node:os";
+import { join as join2 } from "node:path";
+import process3 from "node:process";
 var DEBUG_PREFIX = "debug ";
 function endedOrWhyNot(end) {
   try {
@@ -1034,8 +1159,8 @@ function errorText(error) {
 async function listenForTheServer(end, debug) {
   let directory = null;
   try {
-    directory = process2.platform === "win32" ? null : mkdtempSync(join(tmpdir(), "gdharness-keeper-"));
-    const address = directory === null ? `\\\\.\\pipe\\gdharness-keeper-${randomUUID()}` : join(directory, "keeper.sock");
+    directory = process3.platform === "win32" ? null : mkdtempSync2(join2(tmpdir2(), "gdharness-keeper-"));
+    const address = directory === null ? `\\\\.\\pipe\\gdharness-keeper-${randomUUID()}` : join2(directory, "keeper.sock");
     const server = createServer2((socket) => {
       socket.setEncoding("utf8");
       socket.on("error", () => {});
@@ -1071,13 +1196,13 @@ async function listenForTheServer(end, debug) {
       close: () => {
         server.close();
         if (made !== null) {
-          rmSync(made, { recursive: true, force: true });
+          rmSync2(made, { recursive: true, force: true });
         }
       }
     };
   } catch {
     if (directory !== null) {
-      rmSync(directory, { recursive: true, force: true });
+      rmSync2(directory, { recursive: true, force: true });
     }
     return null;
   }
@@ -1094,22 +1219,6 @@ function listening(server, address) {
 
 // src/outside.ts
 import { fileURLToPath } from "node:url";
-
-// src/spawn.ts
-import {
-  execFile,
-  execFileSync,
-  spawn,
-  spawnSync
-} from "node:child_process";
-function spawnHidden(command, args, options = {}) {
-  return spawn(command, [...args], { ...options, windowsHide: true });
-}
-function spawnShown(command, args, options = {}) {
-  return spawn(command, [...args], { ...options, windowsHide: false });
-}
-
-// src/outside.ts
 function withChanges(base, changes) {
   const env = { ...base };
   for (const [name, value] of Object.entries(changes)) {
@@ -1144,8 +1253,8 @@ function readLaunched(printed) {
 
 // src/run-record.ts
 import { createHash as createHash2 } from "node:crypto";
-import { mkdirSync, openSync, readdirSync, readFileSync, realpathSync, rmSync as rmSync3, statSync } from "node:fs";
-import { basename, dirname as dirname2, join as join3, resolve as resolve2 } from "node:path";
+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";
 
 // src/windows-ask.ts
 var SCRIPT = [
@@ -1168,8 +1277,8 @@ var SCRIPT = [
 `);
 
 // src/runtime-client.ts
-import { tmpdir as tmpdir2 } from "node:os";
-import { dirname, join as join2, resolve } from "node:path";
+import { tmpdir as tmpdir3 } from "node:os";
+import { dirname, join as join3, resolve } from "node:path";
 
 // src/launch.ts
 function envValue(name, variables = process.env) {
@@ -1214,7 +1323,7 @@ function runtimeDirectory(variables = process.env) {
     return explicit;
   }
   const perUser = envValue("XDG_RUNTIME_DIR", variables);
-  return join2(perUser ?? tmpdir2(), "gdharness");
+  return join3(perUser ?? tmpdir3(), "gdharness");
 }
 var ERROR_REPORT_KEEP_MS = 60 * 60 * 1000;
 var verdicts = new Map;
@@ -1222,7 +1331,7 @@ var LATE_ANSWER_MS = 30 * 60000;
 var lateAnswers = new Map;
 
 // src/whole-file.ts
-import { renameSync, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { renameSync, rmSync as rmSync3, writeFileSync as writeFileSync2 } from "node:fs";
 var HELD_FILE_MS = 1000;
 var HELD_FILE_RETRY_MS = 10;
 var HELD_BY_A_READER = new Set(["EPERM", "EACCES", "EBUSY"]);
@@ -1242,7 +1351,7 @@ function writeWhole(path, text) {
       const code = error.code ?? "";
       if (!HELD_BY_A_READER.has(code) || Date.now() >= until) {
         try {
-          rmSync2(partial, { force: true });
+          rmSync3(partial, { force: true });
         } catch {}
         return false;
       }
@@ -1253,14 +1362,14 @@ function writeWhole(path, text) {
 
 // src/run-record.ts
 function runsDirectory() {
-  return join3(runtimeDirectory(), "runs");
+  return join4(runtimeDirectory(), "runs");
 }
 function realAsFarAsItExists(path) {
   const missing = [];
   let at = path;
   for (;; ) {
     try {
-      return join3(realpathSync.native(at), ...missing);
+      return join4(realpathSync.native(at), ...missing);
     } catch {
       const parent = dirname2(at);
       if (parent === at) {
@@ -1277,7 +1386,7 @@ function projectKey(projectPath) {
   return createHash2("sha256").update(folded.replaceAll("\\", "/")).digest("hex").slice(0, 16);
 }
 function runRecordPath(projectPath, directory = runtimeDirectory()) {
-  return join3(directory, "runs", `note-${projectKey(projectPath)}.json`);
+  return join4(directory, "runs", `note-${projectKey(projectPath)}.json`);
 }
 function writeRunRecord(record) {
   mkdirSync(runsDirectory(), { recursive: true });
@@ -1303,7 +1412,7 @@ function recordRunEnded(projectPath, pid, ending) {
 function recordAt(path) {
   let parsed;
   try {
-    parsed = JSON.parse(readFileSync(path, "utf8"));
+    parsed = JSON.parse(readFileSync2(path, "utf8"));
   } catch {
     return null;
   }
@@ -1336,16 +1445,16 @@ function recordAt(path) {
 }
 
 // src/scratch.ts
-import { existsSync, mkdtempSync as mkdtempSync2, readdirSync as readdirSync2, rmSync as rmSync4 } from "node:fs";
-import { tmpdir as tmpdir3 } from "node:os";
-import { join as join4 } from "node:path";
-import process3 from "node:process";
+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 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 mkdtempSync2(join4(tmpdir3(), `gdharness-${kind}-${process3.pid}-`));
+  return mkdtempSync3(join5(tmpdir4(), `gdharness-${kind}-${process4.pid}-`));
 }
 function discardWith(remove, paths) {
   const left = [];
@@ -1369,7 +1478,7 @@ function discard(...paths) {
   return left;
 }
 function remove(path) {
-  rmSync4(path, SWEPT);
+  rmSync5(path, SWEPT);
 }
 function tryAgain(path, attempt) {
   if (attempt === 0) {
@@ -1381,7 +1490,7 @@ function tryAgain(path, attempt) {
     lastTryOnExit();
   }
   const after = AGAIN_AFTER_MS[attempt];
-  if (after === undefined || !existsSync(path)) {
+  if (after === undefined || !existsSync2(path)) {
     waiting.delete(path);
     if (after === undefined) {
       atExit.add(path);
@@ -1403,7 +1512,7 @@ function lastTryOnExit() {
     return;
   }
   lastTryWatched = true;
-  process3.once("exit", () => {
+  process4.once("exit", () => {
     for (const path of [...waiting, ...atExit]) {
       try {
         remove(path);
@@ -1805,18 +1914,22 @@ async function startDirectly(spec, output, hidden, detached = true, errors = out
 }
 async function startThroughHelper(spec, output, stopFile) {
   const scratch = scratchDirectory("desktop");
-  const pidFile = join5(scratch, "pid");
-  const errorFile = join5(scratch, "error");
+  const pidFile = join6(scratch, "pid");
+  const errorFile = join6(scratch, "error");
   const where = spec.desktop === undefined ? "without activation" : `on the ${spec.desktop} desktop`;
   try {
+    const compiled = await ensureHelperCompiled();
+    if (compiled !== null) {
+      return { error: `it could not be started ${where}: ${compiled}` };
+    }
     const wrapper = throughHelper({ ...spec, directory: process.cwd() }, spec.command, spec.args, {
-      spec: join5(scratch, "spec.json"),
+      spec: join6(scratch, "spec.json"),
       pid: pidFile,
       error: errorFile,
       stop: stopFile
     });
     const envChanges = spec.desktop === undefined ? spec.envChanges : { ...spec.envChanges, [DESKTOP_VARIABLE]: spec.desktop };
-    const started = await startDirectly({ ...spec, command: wrapper.command, args: wrapper.args, envChanges }, output, true, false, "ignore", tmpdir4());
+    const started = await startDirectly({ ...spec, command: wrapper.command, args: wrapper.args, envChanges }, output, true, false, "ignore", tmpdir5());
     if ("error" in started) {
       return started;
     }
@@ -1825,15 +1938,15 @@ async function startThroughHelper(spec, output, stopFile) {
       exited.now = true;
     });
     for (let waited = 0;waited < DESKTOP_START_MS; waited += 50) {
-      const pid = existsSync2(pidFile) ? Number(readFileSync2(pidFile, "utf8").trim()) : Number.NaN;
+      const pid = existsSync3(pidFile) ? Number(readFileSync3(pidFile, "utf8").trim()) : Number.NaN;
       if (Number.isInteger(pid) && pid > 0) {
         return { child: started.child, pid };
       }
       if (exited.now) {
-        const why = existsSync2(errorFile) ? readFileSync2(errorFile, "utf8").trim() : "it exited saying nothing";
+        const why = existsSync3(errorFile) ? readFileSync3(errorFile, "utf8").trim() : "it exited saying nothing";
         return { error: `it could not be started ${where}: ${why}` };
       }
-      await delay(50);
+      await delay2(50);
     }
     started.child.kill();
     return { error: `it was not started ${where} within ${DESKTOP_START_MS} ms` };
@@ -1854,7 +1967,7 @@ function profiledBy(path, projectPath) {
   };
   let projectGodot = null;
   try {
-    projectGodot = readFileSync2(join5(projectPath, "project.godot"), "utf8");
+    projectGodot = readFileSync3(join6(projectPath, "project.godot"), "utf8");
   } catch {}
   const observer = new ProfileObserver((totals) => {
     const first = latest === null;
@@ -1956,15 +2069,15 @@ async function keep() {
   const profiled = run?.profile === undefined ? null : profiledBy(run.profile, run.projectPath);
   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" : openSync2(run.transcript, "a");
-  const own = run !== undefined && throughTheHelper(spec) ? mkdtempSync3(join5(tmpdir4(), "gdharness-stop-")) : null;
-  const stopFile = own === null ? "" : join5(own, "stop");
+  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");
   let started;
   try {
     started = await startDetached(toStart, transcript, run === undefined, stopFile);
   } finally {
     if (transcript !== "ignore") {
-      closeSync(transcript);
+      closeSync2(transcript);
     }
   }
   if ("error" in started) {
@@ -1998,7 +2111,7 @@ async function keep() {
       debuggerPeer?.close();
       listening?.close();
       if (own !== null) {
-        rmSync5(own, { recursive: true, force: true });
+        rmSync6(own, { recursive: true, force: true });
       }
       process.exit(0);
     };

package/package.json

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