gdharness 0.13.6 → 0.13.7

package/build/cli.js

@@ -26630,13 +26630,14 @@ var require_fast_uri = __commonJS(function(exports, module) {
       if (!malformedIPLiteral) {
         malformedHost = canonicalizeHost(parsed, options, schemeHandler, isIP);
       }
-      if (!schemeHandler || schemeHandler && !schemeHandler.skipNormalize) {
-        if (uri.indexOf("%") !== -1) {
-          if (parsed.host !== undefined && !malformedIPLiteral) {
-            const host = isIP ? parsed.host : normalizePercentEncoding(parsed.host, true);
-            parsed.host = reescapeHostDelimiters(host, isIP);
-          }
+      if (uri.indexOf("%") !== -1 && parsed.host !== undefined && !malformedIPLiteral) {
+        let host = isIP ? parsed.host : normalizePercentEncoding(parsed.host, true);
+        if (!isIP) {
+          host = normalizePercentEncoding(host.toLowerCase());
         }
+        parsed.host = reescapeHostDelimiters(host, isIP);
+      }
+      if (!schemeHandler || schemeHandler && !schemeHandler.skipNormalize) {
         if (parsed.path) {
           parsed.path = normalizePathEncoding(parsed.path);
         }
@@ -37887,6 +37888,7 @@ class GodotServer {
       };
     }));
     const playing = await this.editorPlayingState();
+    await this.pickUpWhatTheEditorIsPlaying();
     return this.jsonTextResponse({
       editor: {
         ...this.getEditorStatusPayload(),
@@ -38322,6 +38324,33 @@ class GodotServer {
       closeSync(handle);
     }
   }
+  async pickUpWhatTheEditorIsPlaying() {
+    if (this.activeProcess !== null || !this.godotBridge.isConnected()) {
+      return;
+    }
+    const playing = await this.editorPlayingState();
+    if (playing?.playing !== true) {
+      return;
+    }
+    try {
+      await this.dap().connect();
+    } catch (error) {
+      this.logDebug(`Picked up an editor-played run without its adapter: ${errorMessage(error)}`);
+    }
+    this.activeProcess = {
+      process: null,
+      pid: null,
+      log: new GameLog,
+      transcript: null,
+      readOffset: 0,
+      projectPath: this.godotBridge.getStatus().projectPath ?? null,
+      startedAt: Date.now(),
+      exitCode: null,
+      throughEditor: true,
+      brokeOn: null,
+      pickedUpPlaying: true
+    };
+  }
   adoptRecordedRun() {
     const record = readRunRecord();
     if (record === null || !this.couldBeOurs(record.projectPath)) {
@@ -38403,6 +38432,7 @@ class GodotServer {
     });
   }
   async handleWaitForRun(args) {
+    await this.pickUpWhatTheEditorIsPlaying();
     const run = this.currentRun();
     if (!run) {
       return this.createErrorResponse(this.nothingOfOursIsRunning());
@@ -38417,6 +38447,7 @@ class GodotServer {
     return await this.handleGetDebugOutput(args, stillRunning(run) ? budgetMs : undefined);
   }
   async handleGetDebugOutput(args, waitedMs) {
+    await this.pickUpWhatTheEditorIsPlaying();
     const run = this.currentRun();
     if (!run) {
       return this.createErrorResponse(this.nothingOfOursIsRunning());
@@ -38444,6 +38475,9 @@ class GodotServer {
     if (run.endedUnwatched === true) {
       notes.push("This run outlived the server that started it and is over now, so its exit code was never collected. Everything it printed is below, read back from its transcript.");
     }
+    if (run.pickedUpPlaying === true) {
+      notes.push("The editor was already playing this when this server reached it, so this is not the run from its start: what it printed before that went with the server that was listening then. It is the run the editor is holding now, which is the one the debug_* tools answer for.");
+    }
     if (typeof run.endedHere === "string") {
       notes.push(`This run was ended here, by ${run.endedHere}.`);
     } else if (!stillRunning(run) && !run.throughEditor && run.exitCode !== null) {
@@ -38474,6 +38508,7 @@ class GodotServer {
     });
   }
   async handleStopProject() {
+    await this.pickUpWhatTheEditorIsPlaying();
     const stopped = this.currentRun();
     if (!stopped) {
       return this.createErrorResponse(this.nothingOfOursIsRunning());

package/build/index.js

@@ -4060,13 +4060,14 @@ var require_fast_uri = __commonJS(function(exports, module) {
       if (!malformedIPLiteral) {
         malformedHost = canonicalizeHost(parsed, options, schemeHandler, isIP);
       }
-      if (!schemeHandler || schemeHandler && !schemeHandler.skipNormalize) {
-        if (uri.indexOf("%") !== -1) {
-          if (parsed.host !== undefined && !malformedIPLiteral) {
-            const host = isIP ? parsed.host : normalizePercentEncoding(parsed.host, true);
-            parsed.host = reescapeHostDelimiters(host, isIP);
-          }
+      if (uri.indexOf("%") !== -1 && parsed.host !== undefined && !malformedIPLiteral) {
+        let host = isIP ? parsed.host : normalizePercentEncoding(parsed.host, true);
+        if (!isIP) {
+          host = normalizePercentEncoding(host.toLowerCase());
         }
+        parsed.host = reescapeHostDelimiters(host, isIP);
+      }
+      if (!schemeHandler || schemeHandler && !schemeHandler.skipNormalize) {
         if (parsed.path) {
           parsed.path = normalizePathEncoding(parsed.path);
         }
@@ -30641,6 +30642,7 @@ class GodotServer {
       };
     }));
     const playing = await this.editorPlayingState();
+    await this.pickUpWhatTheEditorIsPlaying();
     return this.jsonTextResponse({
       editor: {
         ...this.getEditorStatusPayload(),
@@ -31076,6 +31078,33 @@ class GodotServer {
       closeSync(handle);
     }
   }
+  async pickUpWhatTheEditorIsPlaying() {
+    if (this.activeProcess !== null || !this.godotBridge.isConnected()) {
+      return;
+    }
+    const playing = await this.editorPlayingState();
+    if (playing?.playing !== true) {
+      return;
+    }
+    try {
+      await this.dap().connect();
+    } catch (error) {
+      this.logDebug(`Picked up an editor-played run without its adapter: ${errorMessage(error)}`);
+    }
+    this.activeProcess = {
+      process: null,
+      pid: null,
+      log: new GameLog,
+      transcript: null,
+      readOffset: 0,
+      projectPath: this.godotBridge.getStatus().projectPath ?? null,
+      startedAt: Date.now(),
+      exitCode: null,
+      throughEditor: true,
+      brokeOn: null,
+      pickedUpPlaying: true
+    };
+  }
   adoptRecordedRun() {
     const record = readRunRecord();
     if (record === null || !this.couldBeOurs(record.projectPath)) {
@@ -31157,6 +31186,7 @@ class GodotServer {
     });
   }
   async handleWaitForRun(args) {
+    await this.pickUpWhatTheEditorIsPlaying();
     const run = this.currentRun();
     if (!run) {
       return this.createErrorResponse(this.nothingOfOursIsRunning());
@@ -31171,6 +31201,7 @@ class GodotServer {
     return await this.handleGetDebugOutput(args, stillRunning(run) ? budgetMs : undefined);
   }
   async handleGetDebugOutput(args, waitedMs) {
+    await this.pickUpWhatTheEditorIsPlaying();
     const run = this.currentRun();
     if (!run) {
       return this.createErrorResponse(this.nothingOfOursIsRunning());
@@ -31198,6 +31229,9 @@ class GodotServer {
     if (run.endedUnwatched === true) {
       notes.push("This run outlived the server that started it and is over now, so its exit code was never collected. Everything it printed is below, read back from its transcript.");
     }
+    if (run.pickedUpPlaying === true) {
+      notes.push("The editor was already playing this when this server reached it, so this is not the run from its start: what it printed before that went with the server that was listening then. It is the run the editor is holding now, which is the one the debug_* tools answer for.");
+    }
     if (typeof run.endedHere === "string") {
       notes.push(`This run was ended here, by ${run.endedHere}.`);
     } else if (!stillRunning(run) && !run.throughEditor && run.exitCode !== null) {
@@ -31228,6 +31262,7 @@ class GodotServer {
     });
   }
   async handleStopProject() {
+    await this.pickUpWhatTheEditorIsPlaying();
     const stopped = this.currentRun();
     if (!stopped) {
       return this.createErrorResponse(this.nothingOfOursIsRunning());

package/package.json

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