gdharness 0.9.3 → 0.9.5

package/build/cli.js

@@ -15393,7 +15393,7 @@ var init_tool_definitions = __esm(() => {
     },
     {
       name: "project_test",
-      description: "Runs the project's gdUnit4 tests headless and answers with every case that did not pass: where it is, and what the assertion said. Suites where everything passed are counted rather than listed, and an engine message keeps the frames above gdUnit4 rather than the twenty inside it, so a clean tier answers in a few lines. The class list is rebuilt first, so a suite written a moment ago is found. On Windows and Linux the run gets a user:// of its own, so a suite that saves a game writes nowhere near the saves of the copy somebody plays. Needs gdUnit4 under addons/gdUnit4.",
+      description: "Runs the project's gdUnit4 tests headless and answers with every case that did not pass: where it is, and what the assertion said. Suites where everything passed are counted rather than listed, and an engine message keeps the frames above gdUnit4 rather than the twenty inside it, so a clean tier answers in a few lines. The class list is rebuilt first, so a suite written a moment ago is found. On Windows and Linux the run gets a user:// of its own, so a suite that saves a game writes nowhere near the saves of the copy somebody plays. A run that found nothing to run is never called a pass: gdUnit4 exits cleanly for one, so the answer says so and names the path it looked in. Needs gdUnit4 under addons/gdUnit4.",
       parameters: {
         projectPath: PROJECT_PATH,
         path: {
@@ -15668,7 +15668,7 @@ var init_tool_definitions = __esm(() => {
     },
     {
       name: "editor_run",
-      description: "The run: starting the project, stopping it, or booting it once to see whether it comes up clean. start keeps it running and collecting output until stop, windowed where there is a display and headless where there is not, unless headless says otherwise; only runtime_capture needs the window. check boots it headless for a few frames, waits for it to quit, and answers with the verdict: whether it came up, and every error and warning it printed on the way.",
+      description: "The run: starting the project, stopping it, or booting it once to see whether it comes up clean. start keeps it running and collecting output until it quits or is stopped, windowed where there is a display and headless where there is not, unless headless says otherwise; only runtime_capture needs the window. A run that quits on its own is kept, so a scene that prints an answer and quits is start, then editor_output until running is false. What runs is a scene: a SceneTree script is not an entry point here, so put the script on the root of a scene of its own and name that in scene. check boots it headless for a few frames, waits for it to quit, and answers with the verdict: whether it came up, and every error and warning it printed on the way.",
       parameters: {
         projectPath: PROJECT_PATH,
         scene: { type: "string", description: "A scene to run instead of the main scene." },
@@ -15681,7 +15681,7 @@ var init_tool_definitions = __esm(() => {
       },
       requires: ["projectPath"],
       operations: {
-        start: { summary: "run the project until stop", requires: [] },
+        start: { summary: "run the project until it quits or is stopped", requires: [] },
         stop: { summary: "end the run and answer with what it printed last", requires: [] },
         check: { summary: "boot headless, quit after a few frames, and report the verdict", requires: [] }
       },
@@ -15689,7 +15689,7 @@ var init_tool_definitions = __esm(() => {
     },
     {
       name: "editor_output",
-      description: "What the project started by editor_run has printed, as entries with a severity: the errors and warnings the engine reported, each with where it happened, and everything else as info. Answers with the counts and the verdict as well as the entries.",
+      description: "What the project started by editor_run has printed, as entries with a severity: the errors and warnings the engine reported, each with where it happened, and everything else as info. Answers with the counts and the verdict as well as the entries. A run that has quit still answers here, with running false and its exit code, until the next one starts.",
       parameters: {
         severity: {
           type: "string",
@@ -35141,7 +35141,14 @@ function parseJUnit(xml) {
     suites
   };
 }
-var MalformedReportError, ENTITIES, ATTRIBUTE;
+function whyNoReport(printed, asked) {
+  const missing = printed.map((line) => NO_SUCH_PATH.exec(line)).find((found) => found !== null);
+  if (missing !== undefined) {
+    return `nothing at ${missing[1] ?? asked}`;
+  }
+  return printed.some((line) => NOTHING_RAN.test(line)) ? `no test cases found at ${asked}` : null;
+}
+var MalformedReportError, ENTITIES, ATTRIBUTE, NOTHING_RAN, NO_SUCH_PATH;
 var init_junit = __esm(() => {
   MalformedReportError = class MalformedReportError extends Error {
     constructor(message) {
@@ -35151,6 +35158,8 @@ var init_junit = __esm(() => {
   };
   ENTITIES = { lt: "<", gt: ">", amp: "&", quot: '"', apos: "'" };
   ATTRIBUTE = /\s*([^\s=/>]+)\s*=\s*(?:"([^"]*)"|'([^']*)')/y;
+  NOTHING_RAN = /no test cases found/i;
+  NO_SUCH_PATH = /given directory or file does not exists:\s*(\S+)/i;
 });
 
 // src/lsp_client.ts
@@ -36084,6 +36093,21 @@ function aboveTheRunner(entry) {
     detail: [...entry.detail.slice(0, runner), `[and ${cut} frames inside ${RUNNER_DIRECTORY}]`]
   };
 }
+function elsewhereIn(projectPath, asked) {
+  const wanted = asked.replace(/^res:\/\//, "").replace(/\/+$/, "");
+  if (wanted === "" || existsSync12(join15(projectPath, wanted))) {
+    return "";
+  }
+  const root = (wanted.split("/")[0] ?? "").toLowerCase();
+  let near = [];
+  try {
+    near = readdirSync6(projectPath, { withFileTypes: true }).filter((entry) => entry.isDirectory() && entry.name.toLowerCase() !== root).map((entry) => entry.name).filter((name) => name.toLowerCase().startsWith("test") || root.startsWith(name.toLowerCase()));
+  } catch {
+    return "";
+  }
+  const there = near.map((name) => `res://${name}`).join(" and ");
+  return near.length === 0 ? "" : ` The project does have ${there}.`;
+}
 function hasMainScene(projectFile) {
   const scene = parseProjectGodot(readFileSync13(projectFile, "utf8"))["application"]?.["run/main_scene"];
   return typeof scene === "string" && scene !== "";
@@ -36708,6 +36732,15 @@ class GodotServer {
   }
   async debuggedGame() {
     const game = this.activeProcess;
+    if (game !== null && game.exitCode !== null) {
+      return {
+        ok: false,
+        response: this.createErrorResponse(`The last run has already finished (exit code ${game.exitCode}), so there is no debug session to answer for.`, [
+          "editor_output still reads what it printed, until the next run starts",
+          "editor_run start plays another, which the debugger can hold"
+        ])
+      };
+    }
     if (game === null) {
       return {
         ok: false,
@@ -36975,6 +37008,7 @@ class GodotServer {
     }
     const reports = "res://.godot/gdharness-reports";
     const ignored = readStringArray(args, "ignore") ?? [];
+    const asked = readString(contained.value, "path") ?? "res://test";
     const cmdArgs = [
       "--headless",
       "--path",
@@ -36984,7 +37018,7 @@ class GodotServer {
       "--ignoreHeadlessMode",
       ...readBoolean(args, "failFast") === true ? [] : ["-c"],
       "-a",
-      readString(contained.value, "path") ?? "res://test",
+      asked,
       ...ignored.flatMap((entry) => ["-i", entry]),
       "-rd",
       reports,
@@ -37034,21 +37068,25 @@ class GodotServer {
       105: "script errors"
     };
     const exitCode = run.exitCode;
-    const verdict = hung ? `hung: killed after ${timeoutMs} ms` : verdicts[exitCode ?? -1] ?? `exit ${exitCode ?? "unknown"}`;
+    const printed = run.log.select({ severity: "info", sinceLastCall: false, limit: 200 }).entries;
+    const said = printed.map((entry) => entry.text);
+    const nothingRan = hung ? null : whyNoReport(said, asked);
+    const verdict = hung ? `hung: killed after ${timeoutMs} ms` : nothingRan ?? verdicts[exitCode ?? -1] ?? `exit ${exitCode ?? "unknown"}`;
     if (report === null) {
+      const note = nothingRan === null ? `The test run wrote no report (${verdict}${reportProblem ? `; ${reportProblem}` : ""}).` : `No tests ran: ${verdict}.${elsewhereIn(project.value.path, asked)}`;
       return {
         content: [
-          {
-            type: "text",
-            text: `The test run wrote no report (${verdict}${reportProblem ? `; ${reportProblem}` : ""}).`
-          },
+          { type: "text", text: note },
           {
             type: "text",
             text: JSON.stringify({
+              passed: false,
+              verdict,
+              tests: 0,
               exitCode,
               hung,
               arguments: cmdArgs,
-              entries: run.log.select({ severity: "info", sinceLastCall: false, limit: 60 }).entries
+              entries: printed.slice(0, 60)
             }, null, 2)
           }
         ],
@@ -37200,7 +37238,7 @@ class GodotServer {
         version: godotPath === null ? null : await this.godotVersion(godotPath)
       },
       game: {
-        processActive: this.activeProcess !== null,
+        processActive: this.activeProcess?.exitCode === null,
         playingInEditor: playing,
         runtimeConnected: games.some((game) => game.reachable),
         runtimes: games
@@ -37364,7 +37402,7 @@ class GodotServer {
     if (op === "check") {
       return await this.checkBoot(engine.value, project.value.path, sceneArgument, args);
     }
-    if (this.activeProcess) {
+    if (this.activeProcess?.exitCode === null) {
       this.logDebug("Ending the running game before starting another");
       await this.endActiveGame();
     }
@@ -37383,11 +37421,6 @@ class GodotServer {
     this.logDebug(`Running Godot project: ${engine.value} ${cmdArgs.join(" ")}`);
     const started = this.spawnGame(engine.value, cmdArgs);
     this.activeProcess = started;
-    started.process.on("exit", () => {
-      if (this.activeProcess === started) {
-        this.activeProcess = null;
-      }
-    });
     return this.jsonTextResponse({
       started: true,
       through: "gdharness",
@@ -38603,6 +38636,27 @@ function disconnect(harness, projectPath) {
 `, "utf8");
   return { harness, path, action: "removed" };
 }
+function harnessNote(moved, now) {
+  if (moved.length === 0) {
+    return `  2. Your harness config already named this version, but the server it is running is
+` + `     whichever one it spawned when the session started, which this cannot see from here.
+` + "     Reconnect the MCP server, or restart the harness.";
+  }
+  return `  2. Your harness is still running the server it spawned from ${moved.join(", ")}.
+` + `     Its config names ${now} now.
+` + "     Reconnect the MCP server, or restart the harness.";
+}
+function launchedBy(entry) {
+  if (typeof entry !== "object" || entry === null || Array.isArray(entry)) {
+    return;
+  }
+  const held = entry;
+  const whole = held["command"];
+  const args = Array.isArray(held["args"]) ? held["args"] : [];
+  const parts = Array.isArray(whole) ? whole : [whole, ...args];
+  const said = parts.filter((part) => typeof part === "string");
+  return said.length === 0 ? undefined : said.join(" ");
+}
 function connect(harness, projectPath, launch) {
   const path = configPath(harness, projectPath);
   if (harness.snippet !== undefined) {
@@ -38627,8 +38681,11 @@ function connect(harness, projectPath, launch) {
   }
   const container = typeof existing === "object" && existing !== null && !Array.isArray(existing) ? existing[harness.container] : undefined;
   const already = typeof container === "object" && container !== null && SERVER_KEY in container;
-  return put(harness, path, `${JSON.stringify(merged(existing, harness, launch), null, 2)}
+  const written = put(harness, path, `${JSON.stringify(merged(existing, harness, launch), null, 2)}
 `, already);
+  const was = launchedBy(container?.[SERVER_KEY]);
+  const now = launchedBy(entryFor(harness.shape, launch));
+  return was === undefined || was === now ? written : { ...written, wasLaunchedBy: was };
 }
 function put(harness, path, contents, already) {
   mkdirSync(dirname2(path), { recursive: true });
@@ -39315,11 +39372,16 @@ function reportConnection(group, launch, projectPath) {
     return;
   }
   console.log(`${who}: ${written.action} ${written.path}`);
+  if (written.wasLaunchedBy !== undefined) {
+    console.log(`  it was launched by  ${written.wasLaunchedBy}`);
+    console.log(`  now by              ${[launch.command, ...launch.args].join(" ")}`);
+  }
   for (const harness of group.harnesses) {
     if (harness.manual !== undefined) {
       console.log(`  ${harness.name}: ${harness.manual}`);
     }
   }
+  return written.wasLaunchedBy;
 }
 function nextSteps(projectPath, runtime) {
   console.log(`
@@ -39453,8 +39515,12 @@ async function upgrade() {
   said2(await runOperation(godot, "refresh_class_cache", {}, projectPath), "rebuilding the class list");
   const launch = launchFor(version, godot.godotPath, projectPath);
   const already = HARNESSES.filter((harness) => registered(harness, projectPath));
+  const moved = [];
   for (const group of groupByFile(already, projectPath)) {
-    reportConnection(group, launch, projectPath);
+    const was = reportConnection(group, launch, projectPath);
+    if (was !== undefined && !moved.includes(was)) {
+      moved.push(was);
+    }
   }
   if (already.length === 0) {
     console.log("no harness config names gdharness, so none was re-pinned");
@@ -39466,8 +39532,7 @@ async function upgrade() {
 On ${version}. Two things this could not do for you:`);
   console.log(`  1. The open editor is still running the addons it loaded at startup. Restart it with the
 ` + "     editor_launch restart tool, which closes and reopens the window.");
-  console.log(`  2. Your harness is still running gdharness ${installed}: its config named that version when
-` + "     the server was spawned. Reconnect the MCP server, or restart the harness.");
+  console.log(harnessNote(moved, [launch.command, ...launch.args].join(" ")));
 }
 function doctorReport(projectPath) {
   const report = inspectProject(projectPath);

package/build/index.js

@@ -26583,6 +26583,15 @@ function parseJUnit(xml) {
     suites
   };
 }
+var NOTHING_RAN = /no test cases found/i;
+var NO_SUCH_PATH = /given directory or file does not exists:\s*(\S+)/i;
+function whyNoReport(printed, asked) {
+  const missing = printed.map((line) => NO_SUCH_PATH.exec(line)).find((found) => found !== null);
+  if (missing !== undefined) {
+    return `nothing at ${missing[1] ?? asked}`;
+  }
+  return printed.some((line) => NOTHING_RAN.test(line)) ? `no test cases found at ${asked}` : null;
+}
 
 // src/lsp_client.ts
 import { realpathSync } from "node:fs";
@@ -27987,7 +27996,7 @@ var TOOL_SPECS = [
   },
   {
     name: "project_test",
-    description: "Runs the project's gdUnit4 tests headless and answers with every case that did not pass: where it is, and what the assertion said. Suites where everything passed are counted rather than listed, and an engine message keeps the frames above gdUnit4 rather than the twenty inside it, so a clean tier answers in a few lines. The class list is rebuilt first, so a suite written a moment ago is found. On Windows and Linux the run gets a user:// of its own, so a suite that saves a game writes nowhere near the saves of the copy somebody plays. Needs gdUnit4 under addons/gdUnit4.",
+    description: "Runs the project's gdUnit4 tests headless and answers with every case that did not pass: where it is, and what the assertion said. Suites where everything passed are counted rather than listed, and an engine message keeps the frames above gdUnit4 rather than the twenty inside it, so a clean tier answers in a few lines. The class list is rebuilt first, so a suite written a moment ago is found. On Windows and Linux the run gets a user:// of its own, so a suite that saves a game writes nowhere near the saves of the copy somebody plays. A run that found nothing to run is never called a pass: gdUnit4 exits cleanly for one, so the answer says so and names the path it looked in. Needs gdUnit4 under addons/gdUnit4.",
     parameters: {
       projectPath: PROJECT_PATH,
       path: {
@@ -28262,7 +28271,7 @@ var TOOL_SPECS = [
   },
   {
     name: "editor_run",
-    description: "The run: starting the project, stopping it, or booting it once to see whether it comes up clean. start keeps it running and collecting output until stop, windowed where there is a display and headless where there is not, unless headless says otherwise; only runtime_capture needs the window. check boots it headless for a few frames, waits for it to quit, and answers with the verdict: whether it came up, and every error and warning it printed on the way.",
+    description: "The run: starting the project, stopping it, or booting it once to see whether it comes up clean. start keeps it running and collecting output until it quits or is stopped, windowed where there is a display and headless where there is not, unless headless says otherwise; only runtime_capture needs the window. A run that quits on its own is kept, so a scene that prints an answer and quits is start, then editor_output until running is false. What runs is a scene: a SceneTree script is not an entry point here, so put the script on the root of a scene of its own and name that in scene. check boots it headless for a few frames, waits for it to quit, and answers with the verdict: whether it came up, and every error and warning it printed on the way.",
     parameters: {
       projectPath: PROJECT_PATH,
       scene: { type: "string", description: "A scene to run instead of the main scene." },
@@ -28275,7 +28284,7 @@ var TOOL_SPECS = [
     },
     requires: ["projectPath"],
     operations: {
-      start: { summary: "run the project until stop", requires: [] },
+      start: { summary: "run the project until it quits or is stopped", requires: [] },
       stop: { summary: "end the run and answer with what it printed last", requires: [] },
       check: { summary: "boot headless, quit after a few frames, and report the verdict", requires: [] }
     },
@@ -28283,7 +28292,7 @@ var TOOL_SPECS = [
   },
   {
     name: "editor_output",
-    description: "What the project started by editor_run has printed, as entries with a severity: the errors and warnings the engine reported, each with where it happened, and everything else as info. Answers with the counts and the verdict as well as the entries.",
+    description: "What the project started by editor_run has printed, as entries with a severity: the errors and warnings the engine reported, each with where it happened, and everything else as info. Answers with the counts and the verdict as well as the entries. A run that has quit still answers here, with running false and its exit code, until the next one starts.",
     parameters: {
       severity: {
         type: "string",
@@ -28864,6 +28873,21 @@ function aboveTheRunner(entry) {
     detail: [...entry.detail.slice(0, runner), `[and ${cut} frames inside ${RUNNER_DIRECTORY}]`]
   };
 }
+function elsewhereIn(projectPath, asked) {
+  const wanted = asked.replace(/^res:\/\//, "").replace(/\/+$/, "");
+  if (wanted === "" || existsSync7(join9(projectPath, wanted))) {
+    return "";
+  }
+  const root = (wanted.split("/")[0] ?? "").toLowerCase();
+  let near = [];
+  try {
+    near = readdirSync5(projectPath, { withFileTypes: true }).filter((entry) => entry.isDirectory() && entry.name.toLowerCase() !== root).map((entry) => entry.name).filter((name) => name.toLowerCase().startsWith("test") || root.startsWith(name.toLowerCase()));
+  } catch {
+    return "";
+  }
+  const there = near.map((name) => `res://${name}`).join(" and ");
+  return near.length === 0 ? "" : ` The project does have ${there}.`;
+}
 function hasMainScene(projectFile) {
   const scene = parseProjectGodot(readFileSync9(projectFile, "utf8"))["application"]?.["run/main_scene"];
   return typeof scene === "string" && scene !== "";
@@ -29488,6 +29512,15 @@ class GodotServer {
   }
   async debuggedGame() {
     const game = this.activeProcess;
+    if (game !== null && game.exitCode !== null) {
+      return {
+        ok: false,
+        response: this.createErrorResponse(`The last run has already finished (exit code ${game.exitCode}), so there is no debug session to answer for.`, [
+          "editor_output still reads what it printed, until the next run starts",
+          "editor_run start plays another, which the debugger can hold"
+        ])
+      };
+    }
     if (game === null) {
       return {
         ok: false,
@@ -29755,6 +29788,7 @@ class GodotServer {
     }
     const reports = "res://.godot/gdharness-reports";
     const ignored = readStringArray(args, "ignore") ?? [];
+    const asked = readString(contained.value, "path") ?? "res://test";
     const cmdArgs = [
       "--headless",
       "--path",
@@ -29764,7 +29798,7 @@ class GodotServer {
       "--ignoreHeadlessMode",
       ...readBoolean(args, "failFast") === true ? [] : ["-c"],
       "-a",
-      readString(contained.value, "path") ?? "res://test",
+      asked,
       ...ignored.flatMap((entry) => ["-i", entry]),
       "-rd",
       reports,
@@ -29814,21 +29848,25 @@ class GodotServer {
       105: "script errors"
     };
     const exitCode = run.exitCode;
-    const verdict = hung ? `hung: killed after ${timeoutMs} ms` : verdicts[exitCode ?? -1] ?? `exit ${exitCode ?? "unknown"}`;
+    const printed = run.log.select({ severity: "info", sinceLastCall: false, limit: 200 }).entries;
+    const said = printed.map((entry) => entry.text);
+    const nothingRan = hung ? null : whyNoReport(said, asked);
+    const verdict = hung ? `hung: killed after ${timeoutMs} ms` : nothingRan ?? verdicts[exitCode ?? -1] ?? `exit ${exitCode ?? "unknown"}`;
     if (report === null) {
+      const note = nothingRan === null ? `The test run wrote no report (${verdict}${reportProblem ? `; ${reportProblem}` : ""}).` : `No tests ran: ${verdict}.${elsewhereIn(project.value.path, asked)}`;
       return {
         content: [
-          {
-            type: "text",
-            text: `The test run wrote no report (${verdict}${reportProblem ? `; ${reportProblem}` : ""}).`
-          },
+          { type: "text", text: note },
           {
             type: "text",
             text: JSON.stringify({
+              passed: false,
+              verdict,
+              tests: 0,
               exitCode,
               hung,
               arguments: cmdArgs,
-              entries: run.log.select({ severity: "info", sinceLastCall: false, limit: 60 }).entries
+              entries: printed.slice(0, 60)
             }, null, 2)
           }
         ],
@@ -29980,7 +30018,7 @@ class GodotServer {
         version: godotPath === null ? null : await this.godotVersion(godotPath)
       },
       game: {
-        processActive: this.activeProcess !== null,
+        processActive: this.activeProcess?.exitCode === null,
         playingInEditor: playing,
         runtimeConnected: games.some((game) => game.reachable),
         runtimes: games
@@ -30144,7 +30182,7 @@ class GodotServer {
     if (op === "check") {
       return await this.checkBoot(engine.value, project.value.path, sceneArgument, args);
     }
-    if (this.activeProcess) {
+    if (this.activeProcess?.exitCode === null) {
       this.logDebug("Ending the running game before starting another");
       await this.endActiveGame();
     }
@@ -30163,11 +30201,6 @@ class GodotServer {
     this.logDebug(`Running Godot project: ${engine.value} ${cmdArgs.join(" ")}`);
     const started = this.spawnGame(engine.value, cmdArgs);
     this.activeProcess = started;
-    started.process.on("exit", () => {
-      if (this.activeProcess === started) {
-        this.activeProcess = null;
-      }
-    });
     return this.jsonTextResponse({
       started: true,
       through: "gdharness",

package/package.json

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