gdharness 0.5.7 → 0.5.9

package/build/cli.js

@@ -15821,7 +15821,7 @@ var init_tool_definitions = __esm(() => {
     },
     {
       name: "runtime_input",
-      description: "Input to the running game: a whole click on a Control named by path, or a raw action, key, mouse button or mouse motion. All of it works headless, where the window is 64 by 64 and the GUI only takes what is inside it.",
+      description: "Input to the running game: a whole click on a Control named by path, typing into whatever has the focus, or a raw action, key, mouse button or mouse motion. All of it works headless, where the window is 64 by 64 and the GUI only takes what is inside it.",
       parameters: {
         projectPath: RUNNING_PROJECT_PATH,
         nodePath: { type: "string", description: "click: the Control to click, at its centre." },
@@ -15829,6 +15829,10 @@ var init_tool_definitions = __esm(() => {
         pressed: { type: "boolean", description: "Press or release. Default true." },
         strength: { type: "number", description: "action: 0 to 1. Default 1." },
         keycode: { type: "string", description: 'key: the key name, such as "Space" or "A".' },
+        text: {
+          type: "string",
+          description: "text: what to type. A newline is Enter and a tab is Tab."
+        },
         shift: { type: "boolean" },
         ctrl: { type: "boolean" },
         alt: { type: "boolean" },
@@ -15851,6 +15855,10 @@ var init_tool_definitions = __esm(() => {
         },
         action: { summary: "press or release an action", requires: ["action"] },
         key: { summary: "press or release a key", requires: ["keycode"] },
+        text: {
+          summary: "type a string wherever the focus is, a character at a time",
+          requires: ["text"]
+        },
         mouse_click: { summary: "one mouse button event at a position", requires: ["x", "y"] },
         mouse_motion: { summary: "move the mouse to a position", requires: ["x", "y"] }
       }
@@ -30638,6 +30646,47 @@ var init_stdio2 = __esm(() => {
   init_stdio();
 });
 
+// src/bridge-announce.ts
+import { mkdirSync as mkdirSync5, rmSync as rmSync6, writeFileSync as writeFileSync7 } from "node:fs";
+import { dirname as dirname6, join as join11 } from "node:path";
+function announcementPath(projectPath) {
+  return join11(projectPath, ".godot", "gdharness-bridge.json");
+}
+function announceBridge(projectPath, bridge) {
+  const path = announcementPath(projectPath);
+  try {
+    mkdirSync5(dirname6(path), { recursive: true });
+    const announcement = {
+      protocol: BRIDGE_ANNOUNCE_PROTOCOL,
+      host: bridge.host,
+      port: bridge.port,
+      pid: process.pid,
+      version: bridge.version,
+      startedAt: new Date().toISOString()
+    };
+    writeFileSync7(path, `${JSON.stringify(announcement, null, 2)}
+`, "utf8");
+    return path;
+  } catch (error) {
+    console.error(`[SERVER] Could not announce the editor bridge at ${path}: ${errorMessage(error)}`);
+    return null;
+  }
+}
+function withdrawBridge(path) {
+  if (path === null) {
+    return;
+  }
+  try {
+    rmSync6(path, { force: true });
+  } catch (error) {
+    console.error(`[SERVER] Could not withdraw the editor bridge announcement: ${errorMessage(error)}`);
+  }
+}
+var BRIDGE_ANNOUNCE_PROTOCOL = 1;
+var init_bridge_announce = __esm(() => {
+  init_errors();
+});
+
 // src/framing.ts
 function frame(message) {
   const body = Buffer.from(JSON.stringify(message), "utf8");
@@ -34105,8 +34154,8 @@ function resolveDefaultBridgeHost() {
   const host = process.env["GDHARNESS_BRIDGE_HOST"]?.trim();
   return host === undefined || host === "" ? DEFAULT_HOST : host;
 }
-function getDefaultBridge() {
-  defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost());
+function getDefaultBridge(mayMove = false) {
+  defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost(), DEFAULT_TIMEOUT_MS, mayMove);
   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, GodotBridge, defaultBridge = null;
@@ -34122,19 +34171,37 @@ var init_godot_bridge = __esm(() => {
     connectionInfo = null;
     pendingRequests = new Map;
     resourceQueues = new Map;
-    port;
+    wantedPort;
+    boundPort = null;
     host;
     timeoutMs;
-    constructor(port = DEFAULT_PORT, host = DEFAULT_HOST, timeoutMs = DEFAULT_TIMEOUT_MS) {
+    mayMove;
+    constructor(port = DEFAULT_PORT, host = DEFAULT_HOST, timeoutMs = DEFAULT_TIMEOUT_MS, mayMove = false) {
       super();
-      this.port = port;
+      this.wantedPort = port;
       this.host = host;
       this.timeoutMs = timeoutMs;
+      this.mayMove = mayMove;
     }
-    start() {
+    get port() {
+      return this.boundPort ?? this.wantedPort;
+    }
+    async start() {
       if (this.httpServer) {
-        return Promise.resolve();
+        return;
+      }
+      try {
+        await this.listenOn(this.wantedPort);
+      } catch (error) {
+        const held = error instanceof Error && "code" in error && error.code === "EADDRINUSE";
+        if (!held || !this.mayMove) {
+          throw error;
+        }
+        this.log("warn", `Editor bridge port ${this.wantedPort} is held; taking another one.`);
+        await this.listenOn(0);
       }
+    }
+    listenOn(port) {
       return new Promise((resolve, reject) => {
         const server = http.createServer((_req, res) => {
           res.writeHead(404);
@@ -34158,6 +34225,8 @@ var init_godot_bridge = __esm(() => {
           settled = true;
           this.httpServer = server;
           this.godotWss = godotWss;
+          const bound = server.address();
+          this.boundPort = typeof bound === "object" && bound !== null ? bound.port : port;
           this.log("info", `Editor bridge listening on ${this.host}:${this.port}`);
           resolve();
         });
@@ -34174,7 +34243,7 @@ var init_godot_bridge = __esm(() => {
         godotWss.on("error", (error) => {
           this.log("error", `Godot WebSocket server error: ${error.message}`);
         });
-        server.listen(this.port, this.host);
+        server.listen(port, this.host);
       });
     }
     async stop() {
@@ -34208,6 +34277,7 @@ var init_godot_bridge = __esm(() => {
         this.httpServer = null;
       }
       await Promise.all(closeTasks);
+      this.boundPort = null;
       this.connectionInfo = null;
       this.log("info", "WebSocket bridge stopped");
     }
@@ -34857,7 +34927,7 @@ var init_junit = __esm(() => {
 import { realpathSync } from "node:fs";
 import { readFile, realpath } from "node:fs/promises";
 import { createConnection as createConnection2 } from "node:net";
-import { dirname as dirname6, resolve as resolve3 } from "node:path";
+import { dirname as dirname7, resolve as resolve3 } from "node:path";
 import { fileURLToPath as fileURLToPath3, pathToFileURL } from "node:url";
 function diagnosticsKey(uri) {
   let decoded;
@@ -34983,7 +35053,7 @@ class GodotLSPClient {
     if (this.initialized) {
       return;
     }
-    const rootPath = this.rootPath ?? dirname6(resolve3(filePath));
+    const rootPath = this.rootPath ?? dirname7(resolve3(filePath));
     await this.initialize(rootPath);
   }
   async sendRequest(method, params) {
@@ -35358,7 +35428,7 @@ var init_lsp_client = __esm(() => {
 
 // src/project-scan.ts
 import { readdirSync as readdirSync4, readFileSync as readFileSync9 } from "node:fs";
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 function projectStructure(projectPath) {
   const structure = { scenes: 0, scripts: 0, assets: 0, other: 0 };
   const visit = (directory) => {
@@ -35367,7 +35437,7 @@ function projectStructure(projectPath) {
         continue;
       }
       if (entry.isDirectory()) {
-        visit(join11(directory, entry.name));
+        visit(join12(directory, entry.name));
       } else if (entry.isFile()) {
         const extension = entry.name.split(".").pop()?.toLowerCase() ?? "";
         if (extension === "tscn") {
@@ -35409,7 +35479,7 @@ function searchProject(projectPath, options) {
       if (SKIPPED.has(entry.name)) {
         continue;
       }
-      const entryPath = join11(directory, entry.name);
+      const entryPath = join12(directory, entry.name);
       if (entry.isDirectory()) {
         visit(entryPath);
         continue;
@@ -35451,20 +35521,20 @@ var init_project_scan = __esm(() => {
 import { existsSync as existsSync10, readdirSync as readdirSync5, readFileSync as readFileSync10, unlinkSync } from "node:fs";
 import { createConnection as createConnection3 } from "node:net";
 import { tmpdir as tmpdir4 } from "node:os";
-import { join as join12, resolve as resolve4 } from "node:path";
+import { join as join13, resolve as resolve4 } from "node:path";
 function runtimeDirectory(variables = process.env) {
   const explicit = envValue("GDHARNESS_RUNTIME_DIR", variables);
   if (explicit) {
     return explicit;
   }
   const perUser = envValue("XDG_RUNTIME_DIR", variables);
-  return join12(perUser ?? tmpdir4(), "gdharness");
+  return join13(perUser ?? tmpdir4(), "gdharness");
 }
 function runtimeDirectories(variables = process.env) {
   const candidates = [runtimeDirectory(variables)];
   const fallbacks = process.platform === "win32" ? [envValue("SystemRoot", variables) ?? envValue("windir", variables) ?? "C:\\Windows"] : ["/tmp", "/var/tmp"];
   for (const base of fallbacks) {
-    candidates.push(join12(base, process.platform === "win32" ? "Temp" : "", "gdharness"));
+    candidates.push(join13(base, process.platform === "win32" ? "Temp" : "", "gdharness"));
   }
   return [...new Set(candidates.map((path) => resolve4(path)))];
 }
@@ -35527,7 +35597,7 @@ function announcedIn(directory) {
     if (!match) {
       continue;
     }
-    const file = join12(directory, entry);
+    const file = join13(directory, entry);
     const pid = Number.parseInt(match[1] ?? "", 10);
     const announced = processAlive(pid) ? parseAnnouncement(file, pid) : { kind: "rubbish" };
     if (announced.kind === "rubbish") {
@@ -35673,9 +35743,9 @@ var init_runtime_client = __esm(() => {
 
 // src/server.ts
 import { execFile as execFile5, spawn } from "node:child_process";
-import { existsSync as existsSync11, mkdtempSync as mkdtempSync3, readdirSync as readdirSync6, readFileSync as readFileSync11, realpathSync as realpathSync2, rmSync as rmSync6 } from "node:fs";
+import { existsSync as existsSync11, mkdtempSync as mkdtempSync3, readdirSync as readdirSync6, readFileSync as readFileSync11, realpathSync as realpathSync2, rmSync as rmSync7 } from "node:fs";
 import { tmpdir as tmpdir5 } from "node:os";
-import { basename as basename2, dirname as dirname7, join as join13, normalize as normalize3 } from "node:path";
+import { basename as basename2, dirname as dirname8, join as join14, normalize as normalize3 } from "node:path";
 import { setTimeout as delay2 } from "node:timers/promises";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { promisify as promisify5 } from "node:util";
@@ -35721,7 +35791,7 @@ function camelCased(params) {
 class GodotServer {
   mcp;
   locator = new GodotLocator2;
-  operationsScript = join13(__dirname2, "godot", "operations", "godot_operations.gd");
+  operationsScript = join14(__dirname2, "godot", "operations", "godot_operations.gd");
   godotBridge;
   tools = buildToolDefinitions();
   activeProcess = null;
@@ -35735,8 +35805,11 @@ class GodotServer {
   bridgeRetry = null;
   lastProjectPath = null;
   shutdownInitiated = false;
+  ownProject;
+  announcedAt = null;
   constructor() {
-    this.godotBridge = getDefaultBridge();
+    this.ownProject = envValue("GDHARNESS_PROJECT") ?? null;
+    this.godotBridge = getDefaultBridge(this.ownProject !== null);
     this.mcp = new McpServer({ name: "gdharness", version: SERVER_VERSION }, { capabilities: { tools: {}, resources: {} } });
     this.setupToolHandlers();
     setupResourceHandlers(this.mcp, () => this.lastProjectPath);
@@ -35784,6 +35857,7 @@ class GodotServer {
       this.bridgeStartupError = null;
       const bridgeStatus = this.godotBridge.getStatus();
       console.error(`[SERVER] Godot Editor Bridge started on ${bridgeStatus.host}:${bridgeStatus.port}`);
+      this.announceTheBridge();
     } catch (bridgeError) {
       const code = bridgeError instanceof Error && "code" in bridgeError && typeof bridgeError.code === "string" ? bridgeError.code : null;
       const reason = errorMessage(bridgeError);
@@ -35816,6 +35890,18 @@ class GodotServer {
     this.stopTryingTheBridge();
     const bridgeStatus = this.godotBridge.getStatus();
     console.error(`[SERVER] Godot Editor Bridge came up on ${bridgeStatus.host}:${bridgeStatus.port}; editor tools are live.`);
+    this.announceTheBridge();
+  }
+  announceTheBridge() {
+    if (this.ownProject === null) {
+      return;
+    }
+    const status = this.godotBridge.getStatus();
+    this.announcedAt = announceBridge(this.ownProject, {
+      host: status.host,
+      port: status.port,
+      version: SERVER_VERSION
+    });
   }
   stopTryingTheBridge() {
     if (this.bridgeRetry !== null) {
@@ -35826,6 +35912,8 @@ class GodotServer {
   async cleanup() {
     this.logDebug("Cleaning up resources");
     this.stopTryingTheBridge();
+    withdrawBridge(this.announcedAt);
+    this.announcedAt = null;
     if (this.activeProcess) {
       this.activeProcess.process?.kill();
       this.activeProcess = null;
@@ -36208,7 +36296,7 @@ class GodotServer {
     if (path === undefined) {
       return { ok: false, response: this.createErrorResponse("projectPath is required.") };
     }
-    const file = join13(path, "project.godot");
+    const file = join14(path, "project.godot");
     if (!existsSync11(file)) {
       return {
         ok: false,
@@ -36473,7 +36561,7 @@ class GodotServer {
       return contained.response;
     }
     const runner = "addons/gdUnit4/bin/GdUnitCmdTool.gd";
-    if (!existsSync11(join13(project.value.path, runner))) {
+    if (!existsSync11(join14(project.value.path, runner))) {
       return this.createErrorResponse(`gdUnit4 is not installed in this project: no ${runner}.`, [
         "Install gdUnit4 under addons/gdUnit4, from https://github.com/godot-gdunit-labs/gdUnit4"
       ]);
@@ -36506,7 +36594,7 @@ class GodotServer {
     ];
     const timeoutMs = readPositiveNumber(args, "timeoutMs") ?? 600000;
     this.logDebug(`Running tests: ${engine.value} ${cmdArgs.join(" ")}`);
-    const userData = mkdtempSync3(join13(tmpdir5(), "gdharness-tests-"));
+    const userData = mkdtempSync3(join14(tmpdir5(), "gdharness-tests-"));
     const run = this.spawnGame(engine.value, cmdArgs, userDataIn(userData));
     const hung = await new Promise((resolve) => {
       const timer = setTimeout(() => {
@@ -36522,20 +36610,20 @@ class GodotServer {
         resolve(false);
       });
     });
-    const reportsDir = join13(project.value.path, ".godot", "gdharness-reports");
+    const reportsDir = join14(project.value.path, ".godot", "gdharness-reports");
     let report = null;
     let reportProblem = null;
     try {
       const written = existsSync11(reportsDir) ? readdirSync6(reportsDir).filter((name) => name.startsWith("report_")).sort((a, b) => Number(a.slice("report_".length)) - Number(b.slice("report_".length))) : [];
       const newest = written.at(-1);
       if (newest !== undefined) {
-        report = parseJUnit(readFileSync11(join13(reportsDir, newest, "results.xml"), "utf8"));
+        report = parseJUnit(readFileSync11(join14(reportsDir, newest, "results.xml"), "utf8"));
       }
     } catch (error) {
       reportProblem = errorMessage(error);
     } finally {
-      rmSync6(reportsDir, { recursive: true, force: true });
-      rmSync6(userData, { recursive: true, force: true });
+      rmSync7(reportsDir, { recursive: true, force: true });
+      rmSync7(userData, { recursive: true, force: true });
     }
     const engineEntries = run.log.select({ severity: "warning", sinceLastCall: false, limit: 200 }).entries;
     const verdicts = {
@@ -36648,6 +36736,7 @@ class GodotServer {
       startupError: this.bridgeStartupError,
       staleNote: stale ? addonMismatch(status.addonVersion, SERVER_VERSION) : undefined,
       retryingBridge: this.bridgeRetry === null ? undefined : true,
+      announcedAt: this.announcedAt ?? undefined,
       note: isPortConflict ? "Bridge port is already in use. Another gdharness instance owns the editor bridge, so this server cannot reach the editor. Usually the server this one replaced, still on its way out." : undefined,
       suggestion: isPortConflict ? `This server is asking for the port again every ${BRIDGE_RETRY_MS / 1000}s and takes it the moment the other one lets go, so editor tools come back on their own. Ask again, or end the older gdharness process to have it now.` : undefined
     };
@@ -37043,8 +37132,8 @@ class GodotServer {
       return this.createErrorResponse(choice.problem);
     }
     const expectsScreenshot = command === "capture_screenshot" || command === "capture_viewport";
-    const screenshotDir = expectsScreenshot ? mkdtempSync3(join13(tmpdir5(), "gdharness-runtime-screenshot-")) : null;
-    const screenshotPath = screenshotDir ? join13(screenshotDir, "capture.png") : null;
+    const screenshotDir = expectsScreenshot ? mkdtempSync3(join14(tmpdir5(), "gdharness-runtime-screenshot-")) : null;
+    const screenshotPath = screenshotDir ? join14(screenshotDir, "capture.png") : null;
     try {
       const reply = await runtimeRequest(choice.endpoint, command, screenshotPath ? { ...params, output_path: screenshotPath } : params, timeoutMs);
       if (!reply.ok) {
@@ -37070,7 +37159,7 @@ class GodotServer {
       };
     } finally {
       if (screenshotDir) {
-        rmSync6(screenshotDir, { recursive: true, force: true });
+        rmSync7(screenshotDir, { recursive: true, force: true });
       }
     }
   }
@@ -37132,6 +37221,7 @@ var init_server3 = __esm(() => {
   init_mcp();
   init_stdio2();
   init_types();
+  init_bridge_announce();
   init_class_cache();
   init_dap_client();
   init_errors();
@@ -37150,7 +37240,7 @@ var init_server3 = __esm(() => {
   init_tool_definitions();
   init_update_check();
   run5 = promisify5(execFile5);
-  __dirname2 = dirname7(fileURLToPath4(import.meta.url));
+  __dirname2 = dirname8(fileURLToPath4(import.meta.url));
   PATH_SOLUTIONS = [
     'Give the path relative to the project, such as "scenes/main.tscn" or "res://scenes/main.tscn"',
     "Point projectPath at the project the file belongs to"
@@ -37208,7 +37298,7 @@ var init_server3 = __esm(() => {
 
 // src/cli.ts
 import { existsSync as existsSync12 } from "fs";
-import { join as join14, resolve as resolve5 } from "path";
+import { join as join15, resolve as resolve5 } from "path";
 
 // src/errors.ts
 class Refusal extends Error {
@@ -37418,9 +37508,13 @@ function isEmptyCollection(node) {
 init_errors();
 init_runner();
 var SERVER_KEY = "gdharness";
-function launchFor(version, godotPath, runner = currentRunner()) {
+function launchFor(version, godotPath, projectPath, runner = currentRunner()) {
   const spawn = spawnFor(runner, version);
-  return { command: spawn.command, args: spawn.args, env: { GODOT_PATH: godotPath } };
+  return {
+    command: spawn.command,
+    args: spawn.args,
+    env: { GODOT_PATH: godotPath, GDHARNESS_PROJECT: projectPath }
+  };
 }
 function tomlArray(values) {
   return `[${values.map((value) => `"${value}"`).join(", ")}]`;
@@ -38469,6 +38563,7 @@ that is running, and the project on disk. ${TOOL_SPECS.length} tools, named \`do
 | Where a control is, and whether it is visible | \`runtime_inspect\` \`find\`, \`rect\` |
 | What a property reads right now | \`runtime_inspect\` \`property\`, \`runtime_invoke\` |
 | Press a button | \`runtime_input click\`, which says what was under the pointer |
+| Fill in a field | \`runtime_input click\` on it, then \`runtime_input text\` |
 | Wait for something | \`runtime_wait\`, never a sleep |
 | A picture, for a person who asked to see one | \`runtime_capture\` |
 
@@ -38605,7 +38700,7 @@ class UsageError extends Refusal {
 function projectArgument(at) {
   const named = args.slice(at).find((value) => !value.startsWith("--"));
   const projectPath = resolve5(named ?? ".");
-  if (!existsSync12(join14(projectPath, "project.godot"))) {
+  if (!existsSync12(join15(projectPath, "project.godot"))) {
     throw new UsageError(`Not a Godot project: ${projectPath} holds no project.godot.`);
   }
   return projectPath;
@@ -38731,7 +38826,7 @@ async function setup() {
     console.log(`class list rebuilt: ${String(classes.payload["classes"])} classes`);
   }
   if (!args.includes("--no-connect")) {
-    const launch = launchFor(getLocalVersion(), godot.godotPath);
+    const launch = launchFor(getLocalVersion(), godot.godotPath, projectPath);
     const ask = new Ask;
     let chosen;
     try {
@@ -38826,7 +38921,7 @@ async function upgrade() {
     said(await setRuntime(godot, projectPath, true), "registering the runtime autoload");
   }
   said(await runOperation(godot, "refresh_class_cache", {}, projectPath), "rebuilding the class list");
-  const launch = launchFor(version, godot.godotPath);
+  const launch = launchFor(version, godot.godotPath, projectPath);
   const already = HARNESSES.filter((harness) => registered(harness, projectPath));
   for (const group of groupByFile(already, projectPath)) {
     reportConnection(group, launch, projectPath);

package/build/godot/addons/auto_reload/auto_reload.gd.uid

@@ -0,0 +1 @@
+uid://dfde0vm55ws7m