gdharness 1.3.67 → 1.3.69

package/build/keeper.js

@@ -7265,14 +7265,16 @@ class CompiledHelper {
   file;
   source;
   digest;
-  constructor(named, file, source) {
+  program;
+  constructor(named, file, source, program = false) {
     this.named = named;
     this.file = file;
     this.source = source;
+    this.program = program;
     this.digest = createHash("sha256").update(source).digest("hex").slice(0, 16);
   }
   assembly(directory = tmpdir()) {
-    return join2(directory, `${this.file}-${this.digest}.dll`);
+    return join2(directory, `${this.file}-${this.digest}.${this.program ? "exe" : "dll"}`);
   }
   async ensure(directory = tmpdir(), budgetMs = HELPER_COMPILE_MS, wait = true) {
     const assembly = this.assembly(directory);
@@ -7319,8 +7321,8 @@ class CompiledHelper {
     const script = [
       "$ErrorActionPreference = 'Stop'",
       "try {",
-      `  $partial = ${literal(assembly)} + '.' + $PID`,
-      `  Add-Type -TypeDefinition ([IO.File]::ReadAllText(${literal(source)}, [Text.Encoding]::UTF8)) -OutputAssembly $partial`,
+      `  $partial = ${literal(assembly.slice(0, -4))} + '.' + $PID + ${literal(assembly.slice(-4))}`,
+      `  Add-Type -TypeDefinition ([IO.File]::ReadAllText(${literal(source)}, [Text.Encoding]::UTF8)) -OutputAssembly $partial${this.program ? " -OutputType ConsoleApplication" : ""}`,
       `  Move-Item -LiteralPath $partial -Destination ${literal(assembly)}`,
       "} catch {",
       "  [Console]::Error.WriteLine($_.Exception.Message)",
@@ -7466,6 +7468,18 @@ public static class GdharnessDesktop {
     }
   }
 
+  // The spec, the error file and the step file, by path. What stops it before the pid is written
+  // goes to the error file, since its own streams are the ones the process inherits.
+  public static int Main(string[] args) {
+    try {
+      Step(args[2], "reading its spec");
+      return RunSpec(args[0]);
+    } catch (Exception e) {
+      File.WriteAllText(args[1], e.Message);
+      return 1;
+    }
+  }
+
   // Starts the command line, both of its streams on this process's output, writes its pid, and
   // waits for it: the answer is its exit code. On the named desktop when there is one, whose handle
   // is held until then, since a desktop goes when the last handle to it does, and on this process's
@@ -7474,10 +7488,8 @@ public static class GdharnessDesktop {
   // and the foreground is held while it starts, since Godot also asks for it outright. The process
   // is ended through the handle held here once stopFile appears, which is how a keeper ends a game
   // it did not start itself: a handle names one process, where a pid can name the next one too. The
-  // process starts in directory rather than in this one's, which is a temporary directory: Windows
-  // PowerShell saves its module cache relative to where it runs when the profile does not resolve.
-  // The spec is one field a line, each base64 of its UTF-8, read with no PowerShell cmdlet: a cmdlet
-  // has PowerShell prepare its modules first, on every start.
+  // process starts in directory rather than in this one's, which is a temporary directory. The spec
+  // is one field a line, each base64 of its UTF-8.
   public static int RunSpec(string specFile) {
     string[] lines = File.ReadAllLines(specFile);
     Func<int, string> field = delegate(int index) { return Encoding.UTF8.GetString(Convert.FromBase64String(lines[index])); };
@@ -7537,8 +7549,8 @@ public static class GdharnessDesktop {
     Started started;
     // Inherited by what it starts: without SEM_NOGPFAULTERRORBOX, Windows Error Reporting runs when
     // the target crashes and writes its dump, and with the other two no hard-error box can open.
-    // Set outright rather than cleared from this process's own: Windows PowerShell changes the mode
-    // it inherited as it starts, and was seen reading 0x1 here, without the open-file bit.
+    // Set outright rather than cleared from this process's own, which is whatever started it chose:
+    // a Windows PowerShell host was seen reading 0x1 here, without the open-file bit.
     SetErrorMode(FailCriticalErrors | NoOpenFileErrorBox);
     if (noActivate) {
       LockSetForegroundWindow(LockForeground);
@@ -7586,7 +7598,7 @@ public static class GdharnessDesktop {
   }
 }
 `;
-var HELPER = new CompiledHelper("desktop helper", "gdharness-desktop", SOURCE);
+var HELPER = new CompiledHelper("desktop helper", "gdharness-desktop", SOURCE, true);
 function helperAssembly(directory = tmpdir2()) {
   return HELPER.assembly(directory);
 }
@@ -7625,7 +7637,7 @@ function helperStep(stepFile) {
   try {
     step = readFileSync3(stepFile, "utf8").trim();
   } catch {}
-  return step === null || step === "" ? "Windows PowerShell had not begun running the helper" : `the helper was ${step}`;
+  return step === null || step === "" ? "the helper had not begun" : `the helper was ${step}`;
 }
 function throughHelper(how, command, args, files, assembly = helperAssembly()) {
   mendBeforeStart(args, how.directory);
@@ -7641,31 +7653,7 @@ function throughHelper(how, command, args, files, assembly = helperAssembly()) {
   ];
   writeFileSync3(files.spec, fields.map((field) => Buffer.from(field, "utf8").toString("base64")).join(`
 `), "utf8");
-  const literal = (path) => `'${path.replaceAll("'", "''")}'`;
-  const script = [
-    "$ErrorActionPreference = 'Stop'",
-    "try {",
-    `  [IO.File]::WriteAllText(${literal(files.step)}, 'loading its assembly')`,
-    `  $null = [Reflection.Assembly]::LoadFrom(${literal(assembly)})`,
-    `  $code = [GdharnessDesktop]::RunSpec(${literal(files.spec)})`,
-    "} catch {",
-    `  [IO.File]::WriteAllText(${literal(files.error)}, $_.Exception.Message)`,
-    "  exit 1",
-    "}",
-    "exit $code"
-  ].join(`
-`);
-  return {
-    command: "powershell.exe",
-    args: [
-      "-NoProfile",
-      "-NonInteractive",
-      "-ExecutionPolicy",
-      "Bypass",
-      "-EncodedCommand",
-      Buffer.from(script, "utf16le").toString("base64")
-    ]
-  };
+  return { command: assembly, args: [files.spec, files.error, files.step] };
 }
 
 // src/engine-slots.ts
@@ -9505,6 +9493,97 @@ var WINDOWS_STATUSES = new Map([
   [3221226505, "a stack buffer overrun or a fast fail, so it crashed"]
 ]);
 
+// src/scratch.ts
+import { existsSync as existsSync4, mkdtempSync as mkdtempSync2, readdirSync as readdirSync3, rmSync as rmSync5 } from "node:fs";
+import { tmpdir as tmpdir5 } from "node:os";
+import { join as join5 } from "node:path";
+import process6 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(join5(tmpdir5(), `gdharness-${kind}-${process6.pid}-`));
+}
+function discardWith(removePath, paths) {
+  const left = [];
+  for (const path of paths) {
+    if (!path) {
+      continue;
+    }
+    try {
+      removePath(path);
+    } catch (error) {
+      left.push({ path, reason: error instanceof Error ? error.message : String(error) });
+    }
+  }
+  return left;
+}
+function discard(...paths) {
+  const left = discardWith(remove, paths);
+  for (const { path } of left) {
+    tryAgain(path, 0);
+  }
+  return left;
+}
+function remove(path) {
+  rmSync5(path, SWEPT);
+}
+function tryAgain(path, attempt) {
+  if (attempt === 0) {
+    if (waiting.has(path)) {
+      return;
+    }
+    waiting.add(path);
+    atExit.delete(path);
+    lastTryOnExit();
+  }
+  const after = AGAIN_AFTER_MS[attempt];
+  if (after === undefined || !existsSync4(path)) {
+    waiting.delete(path);
+    if (after === undefined) {
+      atExit.add(path);
+    }
+    return;
+  }
+  setTimeout(() => {
+    try {
+      remove(path);
+      waiting.delete(path);
+    } catch {
+      tryAgain(path, attempt + 1);
+    }
+  }, after).unref();
+}
+var lastTryWatched = false;
+function lastTryOnExit() {
+  if (lastTryWatched) {
+    return;
+  }
+  lastTryWatched = true;
+  process6.once("exit", () => {
+    for (const path of [...waiting, ...atExit]) {
+      try {
+        remove(path);
+      } catch {}
+    }
+  });
+}
+
+// src/doc-cache.ts
+var EMPTY_SCRIPT_DOCS = [
+  "extends SceneTree",
+  "",
+  "",
+  "func _initialize() -> void:",
+  "\tvar cache: Resource = Resource.new()",
+  '\tcache.set_meta("classes", [])',
+  "\tvar saved: Error = ResourceSaver.save(cache, OS.get_cmdline_user_args()[0], ResourceSaver.FLAG_COMPRESS)",
+  "\tquit(0 if saved == OK else 1)",
+  ""
+].join(`
+`);
+
 // src/project-scan.ts
 var SKIPPED = new Set(["node_modules"]);
 var SCENE_EXTENSIONS = new Set(["tscn", "scn"]);
@@ -9591,83 +9670,6 @@ var IMPORTABLE_EXTENSIONS = [
 var IMPORTABLE = new Set(IMPORTABLE_EXTENSIONS);
 var hashes = new Map;
 
-// src/scratch.ts
-import { existsSync as existsSync4, mkdtempSync as mkdtempSync2, readdirSync as readdirSync3, rmSync as rmSync5 } from "node:fs";
-import { tmpdir as tmpdir5 } from "node:os";
-import { join as join5 } from "node:path";
-import process6 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(join5(tmpdir5(), `gdharness-${kind}-${process6.pid}-`));
-}
-function discardWith(removePath, paths) {
-  const left = [];
-  for (const path of paths) {
-    if (!path) {
-      continue;
-    }
-    try {
-      removePath(path);
-    } catch (error) {
-      left.push({ path, reason: error instanceof Error ? error.message : String(error) });
-    }
-  }
-  return left;
-}
-function discard(...paths) {
-  const left = discardWith(remove, paths);
-  for (const { path } of left) {
-    tryAgain(path, 0);
-  }
-  return left;
-}
-function remove(path) {
-  rmSync5(path, SWEPT);
-}
-function tryAgain(path, attempt) {
-  if (attempt === 0) {
-    if (waiting.has(path)) {
-      return;
-    }
-    waiting.add(path);
-    atExit.delete(path);
-    lastTryOnExit();
-  }
-  const after = AGAIN_AFTER_MS[attempt];
-  if (after === undefined || !existsSync4(path)) {
-    waiting.delete(path);
-    if (after === undefined) {
-      atExit.add(path);
-    }
-    return;
-  }
-  setTimeout(() => {
-    try {
-      remove(path);
-      waiting.delete(path);
-    } catch {
-      tryAgain(path, attempt + 1);
-    }
-  }, after).unref();
-}
-var lastTryWatched = false;
-function lastTryOnExit() {
-  if (lastTryWatched) {
-    return;
-  }
-  lastTryWatched = true;
-  process6.once("exit", () => {
-    for (const path of [...waiting, ...atExit]) {
-      try {
-        remove(path);
-      } catch {}
-    }
-  });
-}
-
 // src/answer-json.ts
 var SCALAR = String.raw`(?:-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?|true|false|null)`;
 var SCALAR_ARRAY = new RegExp(String.raw`\[\n\s+(${SCALAR}(?:,\n\s+${SCALAR})*)\n\s*\]`, "g");

package/package.json

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