gdharness 0.13.9 → 0.13.11

package/build/cli.js

@@ -14897,10 +14897,10 @@ function isValueComplete(value) {
   return depth <= 0 && !inString;
 }
 function settingKeys(content) {
-  const named = new Set;
+  const named = new Map;
   for (const [section, entries] of Object.entries(parseProjectGodot(content))) {
-    for (const key of Object.keys(entries)) {
-      named.add(`${section}/${key}`);
+    for (const [key, value] of Object.entries(entries)) {
+      named.set(`${section}/${key}`, value);
     }
   }
   return named;
@@ -15787,7 +15787,10 @@ var init_tool_definitions = __esm(() => {
           summary: "run the project until it quits or is stopped",
           requires: ["projectPath"]
         },
-        stop: { summary: "end the run and answer with what it printed last", requires: [] },
+        stop: {
+          summary: "end the run and answer with what it printed last, naming the process ended under endedPid: a game that started processes of its own keeps them",
+          requires: []
+        },
         check: {
           summary: "boot headless, quit after a few frames, and report the verdict",
           requires: ["projectPath"]
@@ -36452,6 +36455,34 @@ function runningAs(pid) {
     return null;
   }
 }
+function listeningPid(port) {
+  try {
+    if (process.platform === "win32") {
+      const said = execFileSync("powershell", [
+        "-NoProfile",
+        "-NonInteractive",
+        "-Command",
+        `(Get-NetTCPConnection -State Listen -LocalPort ${port} -ErrorAction SilentlyContinue | Select-Object -First 1).OwningProcess`
+      ], { encoding: "utf8", timeout: 15000 }).trim();
+      return /^\d+$/.test(said) ? Number(said) : null;
+    }
+    for (const [command, args, pattern] of [
+      ["lsof", ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"], /^(\d+)/],
+      ["ss", ["-ltnpH", `sport = :${port}`], /pid=(\d+)/]
+    ]) {
+      try {
+        const said = execFileSync(command, [...args], { encoding: "utf8", timeout: 15000 }).trim();
+        const found = pattern.exec(said);
+        if (found?.[1] !== undefined) {
+          return Number(found[1]);
+        }
+      } catch {}
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
 function windowsCommandLine(pid) {
   try {
     const answer = execFileSync("powershell", [
@@ -37886,6 +37917,19 @@ class GodotServer {
   async handleDAP(toolName, args) {
     return handleDAPTool(this.dap(), toolName, args);
   }
+  adapterBelongsElsewhere() {
+    const status = this.godotBridge.getStatus();
+    const ours = status.editorPid;
+    if (ours === undefined) {
+      return null;
+    }
+    const port = this.editorServes("dapPort", "GDHARNESS_DAP_PORT", DEFAULT_DAP_PORT);
+    const holder = listeningPid(port);
+    if (holder === null || holder === ours) {
+      return null;
+    }
+    return `The debug adapter on port ${port} belongs to process ${holder}, and the editor on this server's bridge is process ${ours}. Godot gives every editor the same debug adapter port by default, so the one this editor names in its settings is not necessarily the one it holds. Playing the game now would put another editor's console and another project's debugger under this project's name.`;
+  }
   dap() {
     const port = this.editorServes("dapPort", "GDHARNESS_DAP_PORT", DEFAULT_DAP_PORT);
     if (this.dapClient !== null && this.dapClient.port !== port) {
@@ -37989,12 +38033,12 @@ class GodotServer {
   }
   settingKeysOf(projectPath) {
     if (projectPath === undefined) {
-      return new Set;
+      return new Map;
     }
     try {
       return settingKeys(readFileSync15(join17(projectPath, "project.godot"), "utf8"));
     } catch {
-      return new Set;
+      return new Map;
     }
   }
   async handleRestartEditor() {
@@ -38026,7 +38070,7 @@ class GodotServer {
     }
     const now = this.godotBridge.getStatus();
     const after = this.settingKeysOf(before.projectPath);
-    const dropped = [...settingsBefore].filter((key) => !after.has(key));
+    const dropped = [...settingsBefore].filter(([key]) => !after.has(key));
     return this.jsonTextResponse({
       restarted: true,
       editorPid: now.editorPid,
@@ -38034,8 +38078,8 @@ class GodotServer {
       serverVersion: SERVER_VERSION,
       addonIsStale: now.addonVersion !== SERVER_VERSION,
       staleNote: addonMismatch(now.addonVersion, SERVER_VERSION),
-      settingsDropped: dropped.length > 0 ? dropped : undefined,
-      settingsNote: dropped.length > 0 ? 'The editor saved project.godot on its way out and these keys are no longer in it. Godot writes only what differs from its own defaults, so a key named deliberately at its default value is redundant to the editor and is dropped on save. If any of them were pinned on purpose, to keep "set to this on purpose" and "not set" apart, put them back: nothing else will say they have gone until something depends on one.' : undefined,
+      settingsDropped: dropped.length > 0 ? dropped.map(([setting, was]) => ({ setting, was })) : undefined,
+      settingsNote: dropped.length > 0 ? `The editor saved project.godot on its way out and these keys are no longer in it, with the value each one held. Godot writes only what differs from its own defaults, so a key named deliberately at its default value is redundant to the editor and is dropped on save; it will be dropped again on the next restart. If any of them were pinned on purpose, to keep "set to this on purpose" and "not set" apart, project_settings set puts one back: ${dropped.map(([setting, was]) => `setting "${setting}" value ${JSON.stringify(was)}`).join(", ")}. Nothing else will say they have gone until something depends on one.` : undefined,
       tookMs: Date.now() - began
     });
   }
@@ -38233,6 +38277,14 @@ class GodotServer {
         "GDHARNESS_DAP_PORT points this server at another one"
       ]);
     }
+    const stranger = this.adapterBelongsElsewhere();
+    if (stranger !== null) {
+      return this.createErrorResponse(stranger, [
+        "editor_status names the editor on the bridge and the port it says it serves",
+        "GDHARNESS_DAP_PORT points this server at the right one",
+        "Closing the other editor, or moving its debug adapter port in its editor settings, frees this one"
+      ]);
+    }
     const answer = await this.handleViaBridge("play_scene", scene === null ? {} : { scenePath: `res://${scene}` });
     if (answer.isError === true) {
       return answer;
@@ -38652,11 +38704,13 @@ class GodotServer {
     return this.jsonTextResponse({
       stopped: true,
       through: stopped.throughEditor ? "editor" : "gdharness",
+      endedPid: stopped.pid,
       exitedBeforeStop: stopped.exitCode !== null,
       exitCode: stopped.exitCode,
       errors: stopped.log.count("error"),
       warnings: stopped.log.count("warning"),
       clean: stopped.log.count("error") === 0,
+      note: stopped.throughEditor ? "The editor was asked to stop the scene it is playing. Anything that game started for itself, with OS.create_process or otherwise, is not the editor's to stop and is still running." : "The process named under endedPid was ended. Anything that game started for itself, with OS.create_process or otherwise, is a separate process and is still running.",
       entries: forAnswer(stopped.log.select({ severity: "warning", sinceLastCall: false, limit: 200 }).entries)
     });
   }

package/build/index.js

@@ -27558,10 +27558,10 @@ function isValueComplete(value) {
   return depth <= 0 && !inString;
 }
 function settingKeys(content) {
-  const named = new Set;
+  const named = new Map;
   for (const [section, entries] of Object.entries(parseProjectGodot(content))) {
-    for (const key of Object.keys(entries)) {
-      named.add(`${section}/${key}`);
+    for (const [key, value] of Object.entries(entries)) {
+      named.set(`${section}/${key}`, value);
     }
   }
   return named;
@@ -28099,6 +28099,34 @@ function runningAs(pid) {
     return null;
   }
 }
+function listeningPid(port) {
+  try {
+    if (process.platform === "win32") {
+      const said = execFileSync("powershell", [
+        "-NoProfile",
+        "-NonInteractive",
+        "-Command",
+        `(Get-NetTCPConnection -State Listen -LocalPort ${port} -ErrorAction SilentlyContinue | Select-Object -First 1).OwningProcess`
+      ], { encoding: "utf8", timeout: 15000 }).trim();
+      return /^\d+$/.test(said) ? Number(said) : null;
+    }
+    for (const [command, args, pattern] of [
+      ["lsof", ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"], /^(\d+)/],
+      ["ss", ["-ltnpH", `sport = :${port}`], /pid=(\d+)/]
+    ]) {
+      try {
+        const said = execFileSync(command, [...args], { encoding: "utf8", timeout: 15000 }).trim();
+        const found = pattern.exec(said);
+        if (found?.[1] !== undefined) {
+          return Number(found[1]);
+        }
+      } catch {}
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
 function windowsCommandLine(pid) {
   try {
     const answer = execFileSync("powershell", [
@@ -28849,7 +28877,10 @@ var TOOL_SPECS = [
         summary: "run the project until it quits or is stopped",
         requires: ["projectPath"]
       },
-      stop: { summary: "end the run and answer with what it printed last", requires: [] },
+      stop: {
+        summary: "end the run and answer with what it printed last, naming the process ended under endedPid: a game that started processes of its own keeps them",
+        requires: []
+      },
       check: {
         summary: "boot headless, quit after a few frames, and report the verdict",
         requires: ["projectPath"]
@@ -30640,6 +30671,19 @@ class GodotServer {
   async handleDAP(toolName, args) {
     return handleDAPTool(this.dap(), toolName, args);
   }
+  adapterBelongsElsewhere() {
+    const status = this.godotBridge.getStatus();
+    const ours = status.editorPid;
+    if (ours === undefined) {
+      return null;
+    }
+    const port = this.editorServes("dapPort", "GDHARNESS_DAP_PORT", DEFAULT_DAP_PORT);
+    const holder = listeningPid(port);
+    if (holder === null || holder === ours) {
+      return null;
+    }
+    return `The debug adapter on port ${port} belongs to process ${holder}, and the editor on this server's bridge is process ${ours}. Godot gives every editor the same debug adapter port by default, so the one this editor names in its settings is not necessarily the one it holds. Playing the game now would put another editor's console and another project's debugger under this project's name.`;
+  }
   dap() {
     const port = this.editorServes("dapPort", "GDHARNESS_DAP_PORT", DEFAULT_DAP_PORT);
     if (this.dapClient !== null && this.dapClient.port !== port) {
@@ -30743,12 +30787,12 @@ class GodotServer {
   }
   settingKeysOf(projectPath) {
     if (projectPath === undefined) {
-      return new Set;
+      return new Map;
     }
     try {
       return settingKeys(readFileSync11(join11(projectPath, "project.godot"), "utf8"));
     } catch {
-      return new Set;
+      return new Map;
     }
   }
   async handleRestartEditor() {
@@ -30780,7 +30824,7 @@ class GodotServer {
     }
     const now = this.godotBridge.getStatus();
     const after = this.settingKeysOf(before.projectPath);
-    const dropped = [...settingsBefore].filter((key) => !after.has(key));
+    const dropped = [...settingsBefore].filter(([key]) => !after.has(key));
     return this.jsonTextResponse({
       restarted: true,
       editorPid: now.editorPid,
@@ -30788,8 +30832,8 @@ class GodotServer {
       serverVersion: SERVER_VERSION,
       addonIsStale: now.addonVersion !== SERVER_VERSION,
       staleNote: addonMismatch(now.addonVersion, SERVER_VERSION),
-      settingsDropped: dropped.length > 0 ? dropped : undefined,
-      settingsNote: dropped.length > 0 ? 'The editor saved project.godot on its way out and these keys are no longer in it. Godot writes only what differs from its own defaults, so a key named deliberately at its default value is redundant to the editor and is dropped on save. If any of them were pinned on purpose, to keep "set to this on purpose" and "not set" apart, put them back: nothing else will say they have gone until something depends on one.' : undefined,
+      settingsDropped: dropped.length > 0 ? dropped.map(([setting, was]) => ({ setting, was })) : undefined,
+      settingsNote: dropped.length > 0 ? `The editor saved project.godot on its way out and these keys are no longer in it, with the value each one held. Godot writes only what differs from its own defaults, so a key named deliberately at its default value is redundant to the editor and is dropped on save; it will be dropped again on the next restart. If any of them were pinned on purpose, to keep "set to this on purpose" and "not set" apart, project_settings set puts one back: ${dropped.map(([setting, was]) => `setting "${setting}" value ${JSON.stringify(was)}`).join(", ")}. Nothing else will say they have gone until something depends on one.` : undefined,
       tookMs: Date.now() - began
     });
   }
@@ -30987,6 +31031,14 @@ class GodotServer {
         "GDHARNESS_DAP_PORT points this server at another one"
       ]);
     }
+    const stranger = this.adapterBelongsElsewhere();
+    if (stranger !== null) {
+      return this.createErrorResponse(stranger, [
+        "editor_status names the editor on the bridge and the port it says it serves",
+        "GDHARNESS_DAP_PORT points this server at the right one",
+        "Closing the other editor, or moving its debug adapter port in its editor settings, frees this one"
+      ]);
+    }
     const answer = await this.handleViaBridge("play_scene", scene === null ? {} : { scenePath: `res://${scene}` });
     if (answer.isError === true) {
       return answer;
@@ -31406,11 +31458,13 @@ class GodotServer {
     return this.jsonTextResponse({
       stopped: true,
       through: stopped.throughEditor ? "editor" : "gdharness",
+      endedPid: stopped.pid,
       exitedBeforeStop: stopped.exitCode !== null,
       exitCode: stopped.exitCode,
       errors: stopped.log.count("error"),
       warnings: stopped.log.count("warning"),
       clean: stopped.log.count("error") === 0,
+      note: stopped.throughEditor ? "The editor was asked to stop the scene it is playing. Anything that game started for itself, with OS.create_process or otherwise, is not the editor's to stop and is still running." : "The process named under endedPid was ended. Anything that game started for itself, with OS.create_process or otherwise, is a separate process and is still running.",
       entries: forAnswer(stopped.log.select({ severity: "warning", sinceLastCall: false, limit: 200 }).entries)
     });
   }

package/package.json

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