gdharness 0.12.12 → 0.12.14

package/build/cli.js

@@ -15759,7 +15759,7 @@ var init_tool_definitions = __esm(() => {
     },
     {
       name: "editor_status",
-      description: "Whether the editor addon is connected, which Godot answers, whether the editor is playing something, and whether a game with the runtime addon is reachable.",
+      description: 'Whether the editor addon is connected, which Godot answers, whether the editor is playing something, and whether a game with the runtime addon is reachable. When connected is false, mayYetConnect says whether that is final: the editor dials this server rather than the other way round and backs off between tries, so for the first half-minute after a server starts, false means "not reached yet" as often as it means "no editor". True is worth waiting out; false is an editor that is not there.',
       parameters: {},
       requires: []
     },
@@ -34405,17 +34405,21 @@ function resolveDefaultBridgeHost() {
 function servedPort(said) {
   return typeof said === "number" && Number.isInteger(said) && said > 0 && said <= 65535 ? said : undefined;
 }
+function mayYetConnect(listeningSince, now = Date.now()) {
+  return listeningSince === undefined || now - listeningSince < CONNECT_WINDOW_MS;
+}
 function getDefaultBridge(ownProject = null) {
   defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost(), DEFAULT_TIMEOUT_MS, ownProject);
   return defaultBridge;
 }
-var DEFAULT_PORT = 6505, DEFAULT_HOST = "127.0.0.1", DEFAULT_TIMEOUT_MS = 30000, KEEPALIVE_INTERVAL_MS = 1e4, SECOND_CONNECTION_CLOSE_CODE = 4000, OTHER_PROJECT_CLOSE_CODE = 4001, GodotBridge, defaultBridge = null;
+var DEFAULT_PORT = 6505, DEFAULT_HOST = "127.0.0.1", DEFAULT_TIMEOUT_MS = 30000, KEEPALIVE_INTERVAL_MS = 1e4, SECOND_CONNECTION_CLOSE_CODE = 4000, OTHER_PROJECT_CLOSE_CODE = 4001, CONNECT_WINDOW_MS = 35000, GodotBridge, defaultBridge = null;
 var init_godot_bridge = __esm(() => {
   init_wrapper();
   init_errors();
   init_paths();
   init_ports();
   GodotBridge = class GodotBridge extends EventEmitter {
+    listeningSince = null;
     httpServer = null;
     godotWss = null;
     socket = null;
@@ -34478,6 +34482,7 @@ var init_godot_bridge = __esm(() => {
         });
         server.once("listening", () => {
           settled = true;
+          this.listeningSince = Date.now();
           this.httpServer = server;
           this.godotWss = godotWss;
           const bound = server.address();
@@ -34554,7 +34559,8 @@ var init_godot_bridge = __esm(() => {
         debugPort: this.connectionInfo?.debugPort,
         openedByAServer: this.connectionInfo?.openedByAServer,
         pendingRequests: this.pendingRequests.size,
-        queuedResources: this.resourceQueues.size
+        queuedResources: this.resourceQueues.size,
+        listeningSince: this.listeningSince ?? undefined
       };
     }
     invokeTool(toolName, args) {
@@ -36238,7 +36244,12 @@ function windowsImage(pid) {
   }
 }
 function stillTheRecordedRun(record) {
-  const running = runningAs(record.pid);
+  return judgeRun(record, runningAs(record.pid), "confirmed");
+}
+function couldStillBeTheRecordedRun(record) {
+  return judgeRun(record, runningAs(record.pid), "possible");
+}
+function judgeRun(record, running, needed) {
   if (running === null) {
     return false;
   }
@@ -36248,9 +36259,12 @@ function stillTheRecordedRun(record) {
   if (wanted !== null && !said.includes(wanted)) {
     return false;
   }
-  if (running.kind === "image" || record.projectPath === "") {
+  if (record.projectPath === "") {
     return wanted !== null;
   }
+  if (running.kind === "image") {
+    return needed === "possible" && wanted !== null;
+  }
   const project = process.platform === "win32" ? record.projectPath.toLowerCase() : record.projectPath;
   return said.includes(project);
 }
@@ -36324,6 +36338,7 @@ var init_setup = __esm(() => {
 
 // src/server.ts
 import { execFile as execFile5, spawn } from "node:child_process";
+import { randomUUID as randomUUID2 } from "node:crypto";
 import {
   closeSync,
   existsSync as existsSync13,
@@ -37398,7 +37413,8 @@ class GodotServer {
     if (!classes.ok) {
       return this.answer(classes);
     }
-    const reports = "res://.godot/gdharness-reports";
+    const ours = `gdharness-reports/${randomUUID2()}`;
+    const reports = `res://.godot/${ours}`;
     const ignored = readStringArray(args, "ignore") ?? [];
     const asked = readString(contained.value, "path") ?? "res://test";
     const cmdArgs = [
@@ -37435,7 +37451,7 @@ class GodotServer {
         resolve(false);
       });
     });
-    const reportsDir = join16(project.value.path, ".godot", "gdharness-reports");
+    const reportsDir = join16(project.value.path, ".godot", ...ours.split("/"));
     let report = null;
     let reportProblem = null;
     try {
@@ -37599,6 +37615,7 @@ class GodotServer {
       serverVersion: SERVER_VERSION,
       addonIsStale: status.connected ? stale : undefined,
       bridgeAvailable: this.bridgeStartupError === null,
+      mayYetConnect: status.connected ? undefined : mayYetConnect(status.listeningSince),
       startupError: this.bridgeStartupError,
       staleNote: stale ? addonMismatch(status.addonVersion, SERVER_VERSION) : undefined,
       retryingBridge: this.bridgeRetry === null ? undefined : true,
@@ -38086,7 +38103,7 @@ class GodotServer {
       brokeOn: null
     };
     this.drainTranscript(adopted);
-    if (!alive(record.pid) || !stillTheRecordedRun(record)) {
+    if (!alive(record.pid) || !couldStillBeTheRecordedRun(record)) {
       adopted.log.finish();
       adopted.exitCode = null;
       adopted.endedUnwatched = true;
@@ -39258,6 +39275,32 @@ function registered(harness, projectPath) {
   const held = existing[harness.container];
   return typeof held === "object" && held !== null && !Array.isArray(held) && SERVER_KEY in held;
 }
+function recordedEnginePath(projectPath) {
+  for (const harness of HARNESSES) {
+    if (harness.scope !== "project" || harness.toml || harness.yaml || harness.snippet) {
+      continue;
+    }
+    const path = configPath(harness, projectPath);
+    if (!existsSync4(path)) {
+      continue;
+    }
+    let parsed;
+    try {
+      parsed = JSON.parse(readFileSync(path, "utf8"));
+    } catch {
+      continue;
+    }
+    const entry = reach(reach(parsed, harness.container), SERVER_KEY);
+    const named = reach(reach(entry, harness.shape === "opencode" ? "environment" : "env"), "GODOT_PATH");
+    if (typeof named === "string" && named !== "" && existsSync4(named)) {
+      return named;
+    }
+  }
+  return null;
+}
+function reach(held, key) {
+  return typeof held === "object" && held !== null && !Array.isArray(held) ? held[key] : undefined;
+}
 function disconnect(harness, projectPath) {
   const path = configPath(harness, projectPath);
   if (!existsSync4(path)) {
@@ -40047,8 +40090,8 @@ function projectArgument(at) {
   }
   return projectPath;
 }
-async function engine() {
-  const godotPath = await new GodotLocator().find();
+async function engine(projectPath) {
+  const godotPath = await new GodotLocator().find() ?? (projectPath === undefined ? null : recordedEnginePath(projectPath));
   if (godotPath === null) {
     throw new UsageError(`No Godot executable found. ${GodotLocator.ADVICE.join(". ")}.`);
   }
@@ -40171,7 +40214,7 @@ export, so turn it off before you ship: gdharness runtime off${where}`);
 async function setup() {
   const projectPath = projectArgument(1);
   const runtime = !args.includes("--no-runtime");
-  const godot = await engine();
+  const godot = await engine(projectPath);
   for (const addon of installAddons(projectPath)) {
     console.log(`${addon.replaced ? "replaced" : "installed"} ${addon.path}`);
   }
@@ -40221,7 +40264,7 @@ async function setup() {
 }
 async function uninstall() {
   const projectPath = projectArgument(1);
-  const godot = await engine();
+  const godot = await engine(projectPath);
   const named = namedHarnesses();
   const from = named.length > 0 ? named : HARNESSES;
   for (const harness of from) {
@@ -40272,8 +40315,8 @@ async function upgrade() {
     const where = projectPath === process.cwd() ? "" : ` ${projectPath}`;
     throw new UsageError(`gdharness is not installed in ${projectPath}. Run  gdharness setup${where}  instead.`);
   }
+  const godot = await engine(projectPath);
   console.log(installed === version ? `already ${version}; reinstalling` : `${installed} -> ${version}`);
-  const godot = await engine();
   for (const addon of installAddons(projectPath)) {
     console.log(`${addon.replaced ? "replaced" : "installed"} ${addon.path}`);
   }
@@ -40331,7 +40374,7 @@ async function runtime3() {
     throw new UsageError("gdharness runtime takes on or off, then the project directory.");
   }
   const projectPath = projectArgument(2);
-  const godot = await engine();
+  const godot = await engine(projectPath);
   if (state === "on") {
     await registerRuntime(godot, projectPath);
     return;
@@ -40353,7 +40396,7 @@ async function runtime3() {
 }
 async function classes() {
   const projectPath = projectArgument(1);
-  const godot = await engine();
+  const godot = await engine(projectPath);
   const outcome = await runOperation(godot, "refresh_class_cache", {}, projectPath);
   said2(outcome, "rebuilding the class list");
   if (outcome.ok) {

package/build/index.js

@@ -10132,6 +10132,7 @@ function defectReport(where, error, godotVersion) {
 
 // src/server.ts
 import { execFile as execFile3, spawn } from "node:child_process";
+import { randomUUID as randomUUID2 } from "node:crypto";
 import {
   closeSync,
   existsSync as existsSync8,
@@ -25610,8 +25611,13 @@ function resolveDefaultBridgeHost() {
 function servedPort(said) {
   return typeof said === "number" && Number.isInteger(said) && said > 0 && said <= 65535 ? said : undefined;
 }
+var CONNECT_WINDOW_MS = 35000;
+function mayYetConnect(listeningSince, now = Date.now()) {
+  return listeningSince === undefined || now - listeningSince < CONNECT_WINDOW_MS;
+}
 
 class GodotBridge extends EventEmitter {
+  listeningSince = null;
   httpServer = null;
   godotWss = null;
   socket = null;
@@ -25674,6 +25680,7 @@ class GodotBridge extends EventEmitter {
       });
       server.once("listening", () => {
         settled = true;
+        this.listeningSince = Date.now();
         this.httpServer = server;
         this.godotWss = godotWss;
         const bound = server.address();
@@ -25750,7 +25757,8 @@ class GodotBridge extends EventEmitter {
       debugPort: this.connectionInfo?.debugPort,
       openedByAServer: this.connectionInfo?.openedByAServer,
       pendingRequests: this.pendingRequests.size,
-      queuedResources: this.resourceQueues.size
+      queuedResources: this.resourceQueues.size,
+      listeningSince: this.listeningSince ?? undefined
     };
   }
   invokeTool(toolName, args) {
@@ -27918,7 +27926,12 @@ function windowsImage(pid) {
   }
 }
 function stillTheRecordedRun(record) {
-  const running = runningAs(record.pid);
+  return judgeRun(record, runningAs(record.pid), "confirmed");
+}
+function couldStillBeTheRecordedRun(record) {
+  return judgeRun(record, runningAs(record.pid), "possible");
+}
+function judgeRun(record, running, needed) {
   if (running === null) {
     return false;
   }
@@ -27928,9 +27941,12 @@ function stillTheRecordedRun(record) {
   if (wanted !== null && !said.includes(wanted)) {
     return false;
   }
-  if (running.kind === "image" || record.projectPath === "") {
+  if (record.projectPath === "") {
     return wanted !== null;
   }
+  if (running.kind === "image") {
+    return needed === "possible" && wanted !== null;
+  }
   const project = process.platform === "win32" ? record.projectPath.toLowerCase() : record.projectPath;
   return said.includes(project);
 }
@@ -28646,7 +28662,7 @@ var TOOL_SPECS = [
   },
   {
     name: "editor_status",
-    description: "Whether the editor addon is connected, which Godot answers, whether the editor is playing something, and whether a game with the runtime addon is reachable.",
+    description: 'Whether the editor addon is connected, which Godot answers, whether the editor is playing something, and whether a game with the runtime addon is reachable. When connected is false, mayYetConnect says whether that is final: the editor dials this server rather than the other way round and backs off between tries, so for the first half-minute after a server starts, false means "not reached yet" as often as it means "no editor". True is worth waiting out; false is an editor that is not there.',
     parameters: {},
     requires: []
   },
@@ -30180,7 +30196,8 @@ class GodotServer {
     if (!classes.ok) {
       return this.answer(classes);
     }
-    const reports = "res://.godot/gdharness-reports";
+    const ours = `gdharness-reports/${randomUUID2()}`;
+    const reports = `res://.godot/${ours}`;
     const ignored = readStringArray(args, "ignore") ?? [];
     const asked = readString(contained.value, "path") ?? "res://test";
     const cmdArgs = [
@@ -30217,7 +30234,7 @@ class GodotServer {
         resolve(false);
       });
     });
-    const reportsDir = join10(project.value.path, ".godot", "gdharness-reports");
+    const reportsDir = join10(project.value.path, ".godot", ...ours.split("/"));
     let report = null;
     let reportProblem = null;
     try {
@@ -30381,6 +30398,7 @@ class GodotServer {
       serverVersion: SERVER_VERSION,
       addonIsStale: status.connected ? stale : undefined,
       bridgeAvailable: this.bridgeStartupError === null,
+      mayYetConnect: status.connected ? undefined : mayYetConnect(status.listeningSince),
       startupError: this.bridgeStartupError,
       staleNote: stale ? addonMismatch(status.addonVersion, SERVER_VERSION) : undefined,
       retryingBridge: this.bridgeRetry === null ? undefined : true,
@@ -30868,7 +30886,7 @@ class GodotServer {
       brokeOn: null
     };
     this.drainTranscript(adopted);
-    if (!alive(record.pid) || !stillTheRecordedRun(record)) {
+    if (!alive(record.pid) || !couldStillBeTheRecordedRun(record)) {
       adopted.log.finish();
       adopted.exitCode = null;
       adopted.endedUnwatched = true;

package/package.json

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