gdharness 0.5.2 → 0.5.3

package/build/cli.js

@@ -35460,32 +35460,41 @@ function parseAnnouncement(file, pid) {
   try {
     fields = asParams(JSON.parse(readFileSync10(file, "utf8")));
   } catch {
-    return null;
+    return { kind: "rubbish" };
   }
   const project = readParams(fields, "project");
   const port = readNumber(fields, "port");
   const address = readString(fields, "address");
-  if (readNumber(fields, "protocol") !== RUNTIME_PROTOCOL || readNumber(fields, "pid") !== pid || port === undefined || !Number.isInteger(port) || port < 1 || port > 65535 || address === undefined || project === undefined) {
-    return null;
+  const protocol = readNumber(fields, "protocol");
+  if (readNumber(fields, "pid") !== pid || port === undefined || !Number.isInteger(port) || port < 1 || port > 65535 || address === undefined || project === undefined) {
+    return { kind: "rubbish" };
   }
-  return {
-    pid,
-    port,
-    address,
-    project: { name: readString(project, "name") ?? "", path: readString(project, "path") ?? "" },
-    file
+  const named = {
+    name: readString(project, "name") ?? "",
+    path: readString(project, "path") ?? ""
   };
+  if (protocol !== RUNTIME_PROTOCOL) {
+    return { kind: "unspoken", unspoken: { pid, protocol: protocol ?? 0, project: named } };
+  }
+  return { kind: "runtime", endpoint: { pid, port, address, project: named, file } };
 }
-function discoverRuntimes(directories = runtimeDirectories()) {
-  const found = new Map;
+function runtimesAnnounced(directories = runtimeDirectories()) {
+  const running = new Map;
+  const unspoken = new Map;
   for (const directory of directories) {
-    for (const endpoint of announcedIn(directory)) {
-      if (!found.has(endpoint.pid)) {
-        found.set(endpoint.pid, endpoint);
+    for (const found of announcedIn(directory)) {
+      if (found.kind === "runtime" && !running.has(found.endpoint.pid)) {
+        running.set(found.endpoint.pid, found.endpoint);
+      } else if (found.kind === "unspoken" && !unspoken.has(found.unspoken.pid)) {
+        unspoken.set(found.unspoken.pid, found.unspoken);
       }
     }
   }
-  return [...found.values()].sort((a, b) => b.pid - a.pid);
+  const newest = (a, b) => b.pid - a.pid;
+  return { running: [...running.values()].sort(newest), unspoken: [...unspoken.values()].sort(newest) };
+}
+function discoverRuntimes(directories = runtimeDirectories()) {
+  return runtimesAnnounced(directories).running;
 }
 function announcedIn(directory) {
   if (!existsSync9(directory)) {
@@ -35499,22 +35508,30 @@ function announcedIn(directory) {
     }
     const file = join11(directory, entry);
     const pid = Number.parseInt(match[1] ?? "", 10);
-    const endpoint = processAlive(pid) ? parseAnnouncement(file, pid) : null;
-    if (endpoint) {
-      found.push(endpoint);
-    } else {
+    const announced = processAlive(pid) ? parseAnnouncement(file, pid) : { kind: "rubbish" };
+    if (announced.kind === "rubbish") {
       try {
         unlinkSync(file);
       } catch {}
+      continue;
     }
+    found.push(announced);
   }
   return found;
 }
 function describe2(endpoint) {
   return `pid ${endpoint.pid} on ${endpoint.address}:${endpoint.port} (${endpoint.project.name || "unnamed"} at ${endpoint.project.path})`;
 }
-function chooseRuntime(endpoints, projectPath) {
+function tooNew(unspoken) {
+  const named = unspoken.map((game) => `pid ${game.pid} speaks ${game.protocol} (${game.project.name || "unnamed"} at ${game.project.path})`).join("; ");
+  const half = unspoken.some((game) => game.protocol > RUNTIME_PROTOCOL) ? "this server is the older half: reconnect it so it spawns the installed version" : "the addon is the older half: reinstall it and restart the game";
+  return `A game is running, in a protocol this server does not speak ${named}. This server speaks ${RUNTIME_PROTOCOL}, so ${half}.`;
+}
+function chooseRuntime(endpoints, projectPath, unspoken = []) {
   if (endpoints.length === 0) {
+    if (unspoken.length > 0) {
+      return { problem: tooNew(unspoken) };
+    }
     return {
       problem: "No game with the runtime addon is running. Start one with editor_run, or play the project from the editor with the addon enabled."
     };
@@ -36965,7 +36982,8 @@ class GodotServer {
   }
   async handleRuntimeCommand(command, args, timeoutMs = this.runtimeTimeoutMs()) {
     const { op: _op, projectPath, ...params } = asParams(args);
-    const choice = chooseRuntime(discoverRuntimes(), typeof projectPath === "string" ? projectPath : undefined);
+    const announced = runtimesAnnounced();
+    const choice = chooseRuntime(announced.running, typeof projectPath === "string" ? projectPath : undefined, announced.unspoken);
     if ("problem" in choice) {
       return this.createErrorResponse(choice.problem);
     }

package/build/index.js

@@ -27308,32 +27308,41 @@ function parseAnnouncement(file, pid) {
   try {
     fields = asParams(JSON.parse(readFileSync6(file, "utf8")));
   } catch {
-    return null;
+    return { kind: "rubbish" };
   }
   const project = readParams(fields, "project");
   const port = readNumber(fields, "port");
   const address = readString(fields, "address");
-  if (readNumber(fields, "protocol") !== RUNTIME_PROTOCOL || readNumber(fields, "pid") !== pid || port === undefined || !Number.isInteger(port) || port < 1 || port > 65535 || address === undefined || project === undefined) {
-    return null;
+  const protocol = readNumber(fields, "protocol");
+  if (readNumber(fields, "pid") !== pid || port === undefined || !Number.isInteger(port) || port < 1 || port > 65535 || address === undefined || project === undefined) {
+    return { kind: "rubbish" };
   }
-  return {
-    pid,
-    port,
-    address,
-    project: { name: readString(project, "name") ?? "", path: readString(project, "path") ?? "" },
-    file
+  const named = {
+    name: readString(project, "name") ?? "",
+    path: readString(project, "path") ?? ""
   };
+  if (protocol !== RUNTIME_PROTOCOL) {
+    return { kind: "unspoken", unspoken: { pid, protocol: protocol ?? 0, project: named } };
+  }
+  return { kind: "runtime", endpoint: { pid, port, address, project: named, file } };
 }
-function discoverRuntimes(directories = runtimeDirectories()) {
-  const found = new Map;
+function runtimesAnnounced(directories = runtimeDirectories()) {
+  const running = new Map;
+  const unspoken = new Map;
   for (const directory of directories) {
-    for (const endpoint of announcedIn(directory)) {
-      if (!found.has(endpoint.pid)) {
-        found.set(endpoint.pid, endpoint);
+    for (const found of announcedIn(directory)) {
+      if (found.kind === "runtime" && !running.has(found.endpoint.pid)) {
+        running.set(found.endpoint.pid, found.endpoint);
+      } else if (found.kind === "unspoken" && !unspoken.has(found.unspoken.pid)) {
+        unspoken.set(found.unspoken.pid, found.unspoken);
       }
     }
   }
-  return [...found.values()].sort((a, b) => b.pid - a.pid);
+  const newest = (a, b) => b.pid - a.pid;
+  return { running: [...running.values()].sort(newest), unspoken: [...unspoken.values()].sort(newest) };
+}
+function discoverRuntimes(directories = runtimeDirectories()) {
+  return runtimesAnnounced(directories).running;
 }
 function announcedIn(directory) {
   if (!existsSync5(directory)) {
@@ -27347,22 +27356,30 @@ function announcedIn(directory) {
     }
     const file = join6(directory, entry);
     const pid = Number.parseInt(match[1] ?? "", 10);
-    const endpoint = processAlive(pid) ? parseAnnouncement(file, pid) : null;
-    if (endpoint) {
-      found.push(endpoint);
-    } else {
+    const announced = processAlive(pid) ? parseAnnouncement(file, pid) : { kind: "rubbish" };
+    if (announced.kind === "rubbish") {
       try {
         unlinkSync(file);
       } catch {}
+      continue;
     }
+    found.push(announced);
   }
   return found;
 }
 function describe2(endpoint) {
   return `pid ${endpoint.pid} on ${endpoint.address}:${endpoint.port} (${endpoint.project.name || "unnamed"} at ${endpoint.project.path})`;
 }
-function chooseRuntime(endpoints, projectPath) {
+function tooNew(unspoken) {
+  const named = unspoken.map((game) => `pid ${game.pid} speaks ${game.protocol} (${game.project.name || "unnamed"} at ${game.project.path})`).join("; ");
+  const half = unspoken.some((game) => game.protocol > RUNTIME_PROTOCOL) ? "this server is the older half: reconnect it so it spawns the installed version" : "the addon is the older half: reinstall it and restart the game";
+  return `A game is running, in a protocol this server does not speak ${named}. This server speaks ${RUNTIME_PROTOCOL}, so ${half}.`;
+}
+function chooseRuntime(endpoints, projectPath, unspoken = []) {
   if (endpoints.length === 0) {
+    if (unspoken.length > 0) {
+      return { problem: tooNew(unspoken) };
+    }
     return {
       problem: "No game with the runtime addon is running. Start one with editor_run, or play the project from the editor with the addon enabled."
     };
@@ -29764,7 +29781,8 @@ class GodotServer {
   }
   async handleRuntimeCommand(command, args, timeoutMs = this.runtimeTimeoutMs()) {
     const { op: _op, projectPath, ...params } = asParams(args);
-    const choice = chooseRuntime(discoverRuntimes(), typeof projectPath === "string" ? projectPath : undefined);
+    const announced = runtimesAnnounced();
+    const choice = chooseRuntime(announced.running, typeof projectPath === "string" ? projectPath : undefined, announced.unspoken);
     if ("problem" in choice) {
       return this.createErrorResponse(choice.problem);
     }

package/package.json

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