gdharness 1.0.15 → 1.0.16

package/build/cli.js

@@ -7187,6 +7187,19 @@ function alongside(execPath, name) {
 }
 var init_runner = () => {};
 
+// src/call-signal.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+function withCallSignal(signal, answer) {
+  return signal === undefined ? answer() : current.run(signal, answer);
+}
+function callSignal() {
+  return current.getStore();
+}
+var current;
+var init_call_signal = __esm(() => {
+  current = new AsyncLocalStorage;
+});
+
 // src/dictionary.ts
 function emptyRecord() {
   return Object.create(null);
@@ -7781,14 +7794,7 @@ function reason2(stdout, stderr) {
 async function runImport(godotPath, projectPath) {
   const logDir = mkdtempSync2(join7(tmpdir3(), "gdharness-import-"));
   try {
-    const { stderr } = await run3(godotPath, [
-      "--headless",
-      "--log-file",
-      join7(logDir, "engine.log"),
-      "--path",
-      projectPath,
-      "--import"
-    ]);
+    const { stderr } = await run3(godotPath, ["--headless", "--log-file", join7(logDir, "engine.log"), "--path", projectPath, "--import"], { signal: callSignal() });
     return { ok: true, messages: problems2(stderr) };
   } catch (error) {
     if (error instanceof Error && "stdout" in error && "stderr" in error) {
@@ -7827,7 +7833,7 @@ async function runOperation2(engine, operation, params, projectPath) {
   let stdout;
   let stderr;
   try {
-    ({ stdout, stderr } = await run3(engine.godotPath, args));
+    ({ stdout, stderr } = await run3(engine.godotPath, args, { signal: callSignal() }));
   } catch (error) {
     if (error instanceof Error && "stdout" in error && "stderr" in error) {
       const failed = error;
@@ -7857,6 +7863,7 @@ async function runOperation2(engine, operation, params, projectPath) {
 }
 var run3;
 var init_headless = __esm(() => {
+  init_call_signal();
   init_game_log();
   init_scratch();
   run3 = promisify3(execFile3);
@@ -38591,7 +38598,7 @@ class GodotServer {
   }
   setupToolHandlers() {
     this.mcp.server.setRequestHandler(ListToolsRequestSchema, () => ({ tools: this.tools }));
-    this.mcp.server.setRequestHandler(CallToolRequestSchema, async (request) => {
+    this.mcp.server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
       this.logDebug(`Handling tool request: ${request.params.name}`);
       const spec = toolSpec(request.params.name);
       if (!spec) {
@@ -38606,7 +38613,7 @@ class GodotServer {
         this.lastProjectPath = args["projectPath"];
       }
       this.updates.refresh();
-      const answer = await this.answered(spec.name, checked.op ?? "", args);
+      const answer = await withCallSignal(extra.signal, () => this.answered(spec.name, checked.op ?? "", args));
       return this.withFeedbackNotice(this.withUpdateNotice(answer));
     });
   }
@@ -39377,7 +39384,10 @@ class GodotServer {
     const log = new GameLog;
     let exitCode = 0;
     try {
-      const { stdout, stderr } = await run7(engine.value, exportArgs, { timeout: 300000 });
+      const { stdout, stderr } = await run7(engine.value, exportArgs, {
+        timeout: 300000,
+        signal: callSignal()
+      });
       log.append("stdout", stdout);
       log.append("stderr", stderr);
     } catch (error) {
@@ -40393,6 +40403,23 @@ class GodotServer {
   }
   spawnGame(godotPath, cmdArgs, env) {
     const child = spawn(godotPath, cmdArgs, { stdio: ["ignore", "pipe", "pipe"], ...env ? { env } : {} });
+    const cancelled = callSignal();
+    if (cancelled !== undefined) {
+      const end = () => {
+        if (child.exitCode === null && child.signalCode === null) {
+          this.logDebug(`The call waiting on pid ${child.pid ?? "unknown"} was cancelled; ending it.`);
+          child.kill();
+        }
+      };
+      if (cancelled.aborted) {
+        end();
+      } else {
+        cancelled.addEventListener("abort", end, { once: true });
+        child.once("exit", () => {
+          cancelled.removeEventListener("abort", end);
+        });
+      }
+    }
     const log = new GameLog;
     const started = {
       process: child,
@@ -41515,6 +41542,7 @@ var init_server3 = __esm(() => {
   init_boot_note();
   init_breakpoint_note();
   init_bridge_announce();
+  init_call_signal();
   init_class_cache();
   init_class_note();
   init_config_pin();
@@ -42523,6 +42551,7 @@ function taken(harness, path, held, stripped) {
 }
 
 // src/headless.ts
+init_call_signal();
 init_game_log();
 init_scratch();
 import { execFile as execFile2 } from "node:child_process";
@@ -42587,7 +42616,7 @@ async function runOperation(engine, operation, params, projectPath) {
   let stdout;
   let stderr;
   try {
-    ({ stdout, stderr } = await run2(engine.godotPath, args));
+    ({ stdout, stderr } = await run2(engine.godotPath, args, { signal: callSignal() }));
   } catch (error) {
     if (error instanceof Error && "stdout" in error && "stderr" in error) {
       const failed = error;

package/build/index.js

@@ -25730,6 +25730,16 @@ function withdrawBridge(path) {
   }
 }
 
+// src/call-signal.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+var current = new AsyncLocalStorage;
+function withCallSignal(signal, answer) {
+  return signal === undefined ? answer() : current.run(signal, answer);
+}
+function callSignal() {
+  return current.getStore();
+}
+
 // src/class-cache.ts
 import { existsSync as existsSync3, readdirSync as readdirSync2, readFileSync as readFileSync7, statSync as statSync2 } from "node:fs";
 import { join as join6 } from "node:path";
@@ -27754,14 +27764,7 @@ function reason(stdout, stderr) {
 async function runImport(godotPath, projectPath) {
   const logDir = mkdtempSync(join11(tmpdir3(), "gdharness-import-"));
   try {
-    const { stderr } = await run3(godotPath, [
-      "--headless",
-      "--log-file",
-      join11(logDir, "engine.log"),
-      "--path",
-      projectPath,
-      "--import"
-    ]);
+    const { stderr } = await run3(godotPath, ["--headless", "--log-file", join11(logDir, "engine.log"), "--path", projectPath, "--import"], { signal: callSignal() });
     return { ok: true, messages: problems(stderr) };
   } catch (error) {
     if (error instanceof Error && "stdout" in error && "stderr" in error) {
@@ -27800,7 +27803,7 @@ async function runOperation(engine, operation, params, projectPath) {
   let stdout;
   let stderr;
   try {
-    ({ stdout, stderr } = await run3(engine.godotPath, args));
+    ({ stdout, stderr } = await run3(engine.godotPath, args, { signal: callSignal() }));
   } catch (error) {
     if (error instanceof Error && "stdout" in error && "stderr" in error) {
       const failed = error;
@@ -31329,7 +31332,7 @@ class GodotServer {
   }
   setupToolHandlers() {
     this.mcp.server.setRequestHandler(ListToolsRequestSchema, () => ({ tools: this.tools }));
-    this.mcp.server.setRequestHandler(CallToolRequestSchema, async (request) => {
+    this.mcp.server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
       this.logDebug(`Handling tool request: ${request.params.name}`);
       const spec = toolSpec(request.params.name);
       if (!spec) {
@@ -31344,7 +31347,7 @@ class GodotServer {
         this.lastProjectPath = args["projectPath"];
       }
       this.updates.refresh();
-      const answer = await this.answered(spec.name, checked.op ?? "", args);
+      const answer = await withCallSignal(extra.signal, () => this.answered(spec.name, checked.op ?? "", args));
       return this.withFeedbackNotice(this.withUpdateNotice(answer));
     });
   }
@@ -32115,7 +32118,10 @@ class GodotServer {
     const log = new GameLog;
     let exitCode = 0;
     try {
-      const { stdout, stderr } = await run5(engine.value, exportArgs, { timeout: 300000 });
+      const { stdout, stderr } = await run5(engine.value, exportArgs, {
+        timeout: 300000,
+        signal: callSignal()
+      });
       log.append("stdout", stdout);
       log.append("stderr", stderr);
     } catch (error) {
@@ -33131,6 +33137,23 @@ class GodotServer {
   }
   spawnGame(godotPath, cmdArgs, env) {
     const child = spawn(godotPath, cmdArgs, { stdio: ["ignore", "pipe", "pipe"], ...env ? { env } : {} });
+    const cancelled = callSignal();
+    if (cancelled !== undefined) {
+      const end = () => {
+        if (child.exitCode === null && child.signalCode === null) {
+          this.logDebug(`The call waiting on pid ${child.pid ?? "unknown"} was cancelled; ending it.`);
+          child.kill();
+        }
+      };
+      if (cancelled.aborted) {
+        end();
+      } else {
+        cancelled.addEventListener("abort", end, { once: true });
+        child.once("exit", () => {
+          cancelled.removeEventListener("abort", end);
+        });
+      }
+    }
     const log = new GameLog;
     const started = {
       process: child,

package/package.json

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