gdharness 0.9.0 → 0.9.2

package/build/cli.js

@@ -14711,6 +14711,9 @@ var init_types = __esm(() => {
 
 // src/paths.ts
 import { isAbsolute, relative, resolve, sep } from "node:path";
+function isSameDirectory(onePath, otherPath) {
+  return relative(resolve(onePath), resolve(otherPath)) === "";
+}
 function isWithinRoot(rootPath, candidatePath) {
   const step = relative(resolve(rootPath), resolve(candidatePath));
   return step !== ".." && !step.startsWith(`..${sep}`) && !isAbsolute(step);
@@ -15066,7 +15069,7 @@ function buildToolDefinitions() {
       };
     }
     for (const [name, schema] of Object.entries(spec.parameters)) {
-      const { ops: _ops, ...carried } = schema;
+      const { ops: _ops, blank: _blank, ...carried } = schema;
       properties[name] = carried;
     }
     const required = [...spec.requires];
@@ -15258,7 +15261,8 @@ var init_tool_definitions = __esm(() => {
         projectPath: PROJECT_PATH,
         setting: { type: "string", description: 'Setting path, such as "display/window/size/viewport_width".' },
         value: {
-          description: 'The value to write. Engine types may be tagged, {"_type": "Vector2", "x": 1, "y": 2}.'
+          blank: true,
+          description: 'The value to write. Engine types may be tagged, {"_type": "Vector2", "x": 1, "y": 2}. "" writes an empty string.'
         },
         name: { type: "string", description: "Autoload name." },
         path: { type: "string", description: "Autoload script or scene inside the project." },
@@ -15763,7 +15767,7 @@ var init_tool_definitions = __esm(() => {
         property: {
           type: "string",
           ops: ["property", "find"],
-          description: "property: which one to read. find: read this one off every node matched, so a panel of labels is one call rather than one per label."
+          description: 'property: which one to read. find: read this one off every node matched, so a panel of labels is one call rather than one per label. Colons read through the objects a node holds, "_game:clock:speed", which is where a game keeps what is worth asking about; a step that is not there is named.'
         },
         depth: { type: "number", ops: ["tree"], description: "tree: levels to descend. Default 3." },
         includeProperties: {
@@ -15780,7 +15784,7 @@ var init_tool_definitions = __esm(() => {
         namePattern: {
           type: "string",
           ops: ["find"],
-          description: 'find: a case-insensitive glob on the node name, such as "Enemy*".'
+          description: 'find: a case-insensitive glob on the node name, such as "Enemy*". Matched against the whole name, so a bare word finds only a node called exactly that; an answer of none says how many names contain it and what glob would have found them.'
         },
         group: { type: "string", ops: ["find"], description: "find: a group the node is in." },
         says: {
@@ -15821,7 +15825,7 @@ var init_tool_definitions = __esm(() => {
           requires: ["nodePath"]
         },
         property: {
-          summary: "what one property reads on a node, refusing a property the node does not have",
+          summary: "what one property reads on a node, or through the objects it holds, refusing a name nothing along the way has",
           requires: ["nodePath", "property"]
         },
         metrics: { summary: "frame time, memory, draw calls and the rest", requires: [] }
@@ -15834,9 +15838,21 @@ var init_tool_definitions = __esm(() => {
       parameters: {
         projectPath: RUNNING_PROJECT_PATH,
         nodePath: { type: "string", description: 'Absolute node path, such as "/root/Main/Player".' },
-        property: { type: "string", ops: ["set"] },
-        value: { ops: ["set"], description: "set: the value, fitted to the property's type." },
-        method: { type: "string", ops: ["call"] },
+        property: {
+          type: "string",
+          ops: ["set"],
+          description: 'set: which one to write. Colons write through the objects a node holds, "_game:run:day", and the answer reads back off the same holder, so a write a typed container refused shows as an unchanged value.'
+        },
+        value: {
+          ops: ["set"],
+          blank: true,
+          description: `set: the value, fitted to the property's type. "" writes an empty string.`
+        },
+        method: {
+          type: "string",
+          ops: ["call"],
+          description: 'call: which one to call. Colons call through the objects a node holds, "_game:run:advance", the same way a property is written through them.'
+        },
         args: {
           type: "array",
           ops: ["call"],
@@ -15845,8 +15861,14 @@ var init_tool_definitions = __esm(() => {
       },
       requires: ["nodePath"],
       operations: {
-        set: { summary: "set a property", requires: ["property", "value"] },
-        call: { summary: "call a method and return its result", requires: ["method"] }
+        set: {
+          summary: "set a property, on a node or on an object it holds",
+          requires: ["property", "value"]
+        },
+        call: {
+          summary: "call a method, on a node or on an object it holds, and return its result",
+          requires: ["method"]
+        }
       }
     },
     {
@@ -15898,7 +15920,8 @@ var init_tool_definitions = __esm(() => {
         text: {
           type: "string",
           ops: ["text", "choose"],
-          description: "text: what to type. A newline is Enter and a tab is Tab. choose: the item to take, by what it says."
+          blank: true,
+          description: 'text: what to type. A newline is Enter and a tab is Tab, a space is a space, and "" with replace empties the field. choose: the item to take, by what it says.'
         },
         replace: {
           type: "boolean",
@@ -30759,11 +30782,29 @@ var init_stdio2 = __esm(() => {
 });
 
 // src/bridge-announce.ts
-import { mkdirSync as mkdirSync5, rmSync as rmSync6, writeFileSync as writeFileSync7 } from "node:fs";
+import { mkdirSync as mkdirSync5, readFileSync as readFileSync9, 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 readAnnouncement(path) {
+  try {
+    const parsed = JSON.parse(readFileSync9(path, "utf8"));
+    if (typeof parsed !== "object" || parsed === null) {
+      return null;
+    }
+    const said = parsed;
+    if (typeof said.port !== "number" || typeof said.pid !== "number") {
+      return null;
+    }
+    return said;
+  } catch {
+    return null;
+  }
+}
+function announcementIsOurs(path) {
+  return readAnnouncement(path)?.pid === process.pid;
+}
 function announceBridge(projectPath, bridge) {
   const path = announcementPath(projectPath);
   try {
@@ -30785,7 +30826,7 @@ function announceBridge(projectPath, bridge) {
   }
 }
 function withdrawBridge(path) {
-  if (path === null) {
+  if (path === null || !announcementIsOurs(path)) {
     return;
   }
   try {
@@ -34311,14 +34352,15 @@ function resolveDefaultBridgeHost() {
 function servedPort(said) {
   return typeof said === "number" && Number.isInteger(said) && said > 0 && said <= 65535 ? said : undefined;
 }
-function getDefaultBridge(mayMove = false) {
-  defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost(), DEFAULT_TIMEOUT_MS, mayMove);
+function getDefaultBridge(ownProject = null) {
+  defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost(), DEFAULT_TIMEOUT_MS, ownProject);
   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;
+var DEFAULT_PORT = 6505, DEFAULT_HOST = "127.0.0.1", DEFAULT_TIMEOUT_MS = 30000, KEEPALIVE_INTERVAL_MS = 1e4, SECOND_CONNECTION_CLOSE_CODE = 4000, OTHER_PROJECT_CLOSE_CODE = 4001, GodotBridge, defaultBridge = null;
 var init_godot_bridge = __esm(() => {
   init_wrapper();
   init_errors();
+  init_paths();
   init_ports();
   GodotBridge = class GodotBridge extends EventEmitter {
     httpServer = null;
@@ -34332,13 +34374,16 @@ var init_godot_bridge = __esm(() => {
     boundPort = null;
     host;
     timeoutMs;
-    mayMove;
-    constructor(port = DEFAULT_PORT, host = DEFAULT_HOST, timeoutMs = DEFAULT_TIMEOUT_MS, mayMove = false) {
+    ownProject;
+    constructor(port = DEFAULT_PORT, host = DEFAULT_HOST, timeoutMs = DEFAULT_TIMEOUT_MS, ownProject = null) {
       super();
       this.wantedPort = port;
       this.host = host;
       this.timeoutMs = timeoutMs;
-      this.mayMove = mayMove;
+      this.ownProject = ownProject;
+    }
+    get mayMove() {
+      return this.ownProject !== null;
     }
     get port() {
       return this.boundPort ?? this.wantedPort;
@@ -34584,6 +34629,10 @@ var init_godot_bridge = __esm(() => {
         }
         case "godot_ready":
           if (this.connectionInfo) {
+            if (this.belongsElsewhere(message.project_path)) {
+              this.sendElsewhere(message.project_path);
+              return;
+            }
             this.connectionInfo.projectPath = message.project_path;
             this.connectionInfo.addonVersion = message.addon_version ?? "";
             this.connectionInfo.editorPid = message.editor_pid;
@@ -34666,6 +34715,21 @@ var init_godot_bridge = __esm(() => {
       clearInterval(this.pingInterval);
       this.pingInterval = null;
     }
+    belongsElsewhere(theirProject) {
+      if (this.ownProject === null || theirProject.trim() === "") {
+        return false;
+      }
+      return !isSameDirectory(this.ownProject, theirProject);
+    }
+    sendElsewhere(theirProject) {
+      const said = `this server serves ${this.ownProject ?? ""}, and that editor has ${theirProject} open`;
+      this.log("warn", `Turning away an editor from another project: ${said}`);
+      const stranger = this.socket;
+      this.socket = null;
+      this.connectionInfo = null;
+      this.stopKeepalive();
+      stranger?.close(OTHER_PROJECT_CLOSE_CODE, said);
+    }
     handleDisconnect(disconnectedSocket, reason) {
       if (disconnectedSocket && this.socket && disconnectedSocket !== this.socket) {
         this.log("debug", "Ignoring stale Godot socket disconnect event");
@@ -35590,7 +35654,7 @@ var init_lsp_client = __esm(() => {
 });
 
 // src/project-scan.ts
-import { readdirSync as readdirSync4, readFileSync as readFileSync9 } from "node:fs";
+import { readdirSync as readdirSync4, readFileSync as readFileSync10 } from "node:fs";
 import { join as join12 } from "node:path";
 function projectStructure(projectPath) {
   const structure = { scenes: 0, scripts: 0, assets: 0, other: 0 };
@@ -35653,7 +35717,7 @@ function searchProject(projectPath, options) {
       }
       result.summary.files_searched += 1;
       const matches = [];
-      for (const [index, line] of readFileSync9(entryPath, "utf8").split(`
+      for (const [index, line] of readFileSync10(entryPath, "utf8").split(`
 `).entries()) {
         if (full()) {
           break;
@@ -35681,7 +35745,7 @@ var init_project_scan = __esm(() => {
 });
 
 // src/runtime-client.ts
-import { existsSync as existsSync10, readdirSync as readdirSync5, readFileSync as readFileSync10, unlinkSync } from "node:fs";
+import { existsSync as existsSync10, readdirSync as readdirSync5, readFileSync as readFileSync11, unlinkSync } from "node:fs";
 import { createConnection as createConnection3 } from "node:net";
 import { tmpdir as tmpdir4 } from "node:os";
 import { join as join13, resolve as resolve4 } from "node:path";
@@ -35712,7 +35776,7 @@ function processAlive(pid) {
 function parseAnnouncement(file, pid) {
   let fields;
   try {
-    fields = asParams(JSON.parse(readFileSync10(file, "utf8")));
+    fields = asParams(JSON.parse(readFileSync11(file, "utf8")));
   } catch {
     return { kind: "rubbish" };
   }
@@ -35905,14 +35969,14 @@ var init_runtime_client = __esm(() => {
 });
 
 // src/setup.ts
-import { cpSync as cpSync2, existsSync as existsSync11, mkdirSync as mkdirSync6, readFileSync as readFileSync11, rmSync as rmSync7, writeFileSync as writeFileSync8 } from "node:fs";
+import { cpSync as cpSync2, existsSync as existsSync11, mkdirSync as mkdirSync6, readFileSync as readFileSync12, rmSync as rmSync7, writeFileSync as writeFileSync8 } from "node:fs";
 import { dirname as dirname8, join as join14 } from "node:path";
 function installedAddonVersion(projectPath) {
   const marker = join14(projectPath, "addons", ADDONS2[0], VERSION_MARKER2);
   if (!existsSync11(marker)) {
     return null;
   }
-  const said = readFileSync11(marker, "utf8").trim();
+  const said = readFileSync12(marker, "utf8").trim();
   return said === "" ? null : said;
 }
 var ADDONS2, VERSION_MARKER2 = ".gdharness-version";
@@ -35926,7 +35990,7 @@ var init_setup = __esm(() => {
 
 // src/server.ts
 import { execFile as execFile5, spawn } from "node:child_process";
-import { existsSync as existsSync12, mkdtempSync as mkdtempSync3, readdirSync as readdirSync6, readFileSync as readFileSync12, realpathSync as realpathSync2, rmSync as rmSync8 } from "node:fs";
+import { existsSync as existsSync12, mkdtempSync as mkdtempSync3, readdirSync as readdirSync6, readFileSync as readFileSync13, realpathSync as realpathSync2, rmSync as rmSync8 } from "node:fs";
 import { tmpdir as tmpdir5 } from "node:os";
 import { basename as basename2, dirname as dirname9, join as join15, normalize as normalize3 } from "node:path";
 import { setTimeout as delay2 } from "node:timers/promises";
@@ -36007,11 +36071,11 @@ function aboveTheRunner(entry) {
   };
 }
 function hasMainScene(projectFile) {
-  const scene = parseProjectGodot(readFileSync12(projectFile, "utf8"))["application"]?.["run/main_scene"];
+  const scene = parseProjectGodot(readFileSync13(projectFile, "utf8"))["application"]?.["run/main_scene"];
   return typeof scene === "string" && scene !== "";
 }
 function editorPlaysHeadless(projectFile) {
-  const runArgs = parseProjectGodot(readFileSync12(projectFile, "utf8"))["editor"]?.["run/main_run_args"];
+  const runArgs = parseProjectGodot(readFileSync13(projectFile, "utf8"))["editor"]?.["run/main_run_args"];
   return typeof runArgs === "string" && /(?:^|\s)--headless(?:\s|$)/.test(runArgs);
 }
 function camelCased(params) {
@@ -36039,13 +36103,14 @@ class GodotServer {
   dapClient = null;
   bridgeStartupError = null;
   bridgeRetry = null;
+  successorWatch = null;
   lastProjectPath = null;
   shutdownInitiated = false;
   ownProject;
   announcedAt = null;
   constructor() {
     this.ownProject = envValue("GDHARNESS_PROJECT") ?? null;
-    this.godotBridge = getDefaultBridge(this.ownProject !== null);
+    this.godotBridge = getDefaultBridge(this.ownProject);
     this.mcp = new McpServer({ name: "gdharness", version: SERVER_VERSION }, { capabilities: { tools: {}, resources: {} } });
     this.setupToolHandlers();
     setupResourceHandlers(this.mcp, () => this.lastProjectPath);
@@ -36138,6 +36203,7 @@ class GodotServer {
       port: status.port,
       version: SERVER_VERSION
     });
+    this.watchForASuccessor();
   }
   stopTryingTheBridge() {
     if (this.bridgeRetry !== null) {
@@ -36145,9 +36211,46 @@ class GodotServer {
       this.bridgeRetry = null;
     }
   }
+  watchForASuccessor() {
+    if (this.ownProject === null || this.successorWatch !== null) {
+      return;
+    }
+    const watch = setInterval(() => {
+      const successor = this.supersededBy();
+      if (successor === null) {
+        return;
+      }
+      console.error(`[SERVER] pid ${successor} now serves ${this.ownProject}; this server is finished and is stopping.`);
+      this.handleShutdown(`superseded by ${successor}`, 0);
+    }, SUCCESSOR_CHECK_MS);
+    watch.unref();
+    this.successorWatch = watch;
+  }
+  supersededBy() {
+    if (this.ownProject === null) {
+      return null;
+    }
+    const announced = readAnnouncement(announcementPath(this.ownProject));
+    if (announced === null || announced.pid === process.pid) {
+      return null;
+    }
+    try {
+      process.kill(announced.pid, 0);
+      return announced.pid;
+    } catch {
+      return null;
+    }
+  }
+  stopWatchingForASuccessor() {
+    if (this.successorWatch !== null) {
+      clearInterval(this.successorWatch);
+      this.successorWatch = null;
+    }
+  }
   async cleanup() {
     this.logDebug("Cleaning up resources");
     this.stopTryingTheBridge();
+    this.stopWatchingForASuccessor();
     withdrawBridge(this.announcedAt);
     this.announcedAt = null;
     if (this.activeProcess) {
@@ -36360,7 +36463,11 @@ class GodotServer {
     const required = [...spec.requires, ...op !== null ? spec.operations?.[op]?.requires ?? [] : []];
     const missing = required.filter((field) => {
       const value = Object.hasOwn(args, field) ? args[field] : undefined;
-      return value === undefined || value === null || typeof value === "string" && value.trim() === "";
+      if (value === undefined || value === null) {
+        return true;
+      }
+      const blank = typeof value === "string" && value.trim() === "";
+      return blank && spec.parameters[field]?.blank !== true;
     });
     if (missing.length > 0) {
       const where = op !== null ? `${spec.name} ${op}` : spec.name;
@@ -36725,7 +36832,7 @@ class GodotServer {
     if (!engine.ok) {
       return engine.response;
     }
-    const application = parseProjectGodot(readFileSync12(project.value.file, "utf8"))["application"] ?? {};
+    const application = parseProjectGodot(readFileSync13(project.value.file, "utf8"))["application"] ?? {};
     const name = application["config/name"];
     const mainScene = application["run/main_scene"];
     const info = {
@@ -36900,7 +37007,7 @@ class GodotServer {
       const written = existsSync12(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(readFileSync12(join15(reportsDir, newest, "results.xml"), "utf8"));
+        report = parseJUnit(readFileSync13(join15(reportsDir, newest, "results.xml"), "utf8"));
       }
     } catch (error) {
       reportProblem = errorMessage(error);
@@ -37490,7 +37597,7 @@ class GodotServer {
       return {
         content: [
           { type: "text", text: `Screenshot captured: ${dimensions}` },
-          { type: "image", data: readFileSync12(screenshotPath).toString("base64"), mimeType: "image/png" }
+          { type: "image", data: readFileSync13(screenshotPath).toString("base64"), mimeType: "image/png" }
         ]
       };
     } finally {
@@ -37556,7 +37663,7 @@ async function runGodotServer() {
   const server = new GodotServer;
   await server.run();
 }
-var UPDATE_NOTICE_EVERY = 500, FEEDBACK_NOTICE_EVERY = 250, run5, __dirname2, EDITOR_RESTART_TIMEOUT_MS = 90000, SLOWEST_FRAME_RATE = 20, VALUE_NAMES, BRIDGE_RETRY_MS = 2000, PATH_SOLUTIONS, PROJECT_FILE_ARGUMENTS, DEBUG_STATE_CALLS, HEADLESS_OPERATIONS, PROJECT_INFO_SECTIONS, RUNNER_DIRECTORY = "addons/gdUnit4/";
+var UPDATE_NOTICE_EVERY = 500, FEEDBACK_NOTICE_EVERY = 250, run5, __dirname2, EDITOR_RESTART_TIMEOUT_MS = 90000, SLOWEST_FRAME_RATE = 20, VALUE_NAMES, BRIDGE_RETRY_MS = 2000, SUCCESSOR_CHECK_MS = 1e4, PATH_SOLUTIONS, PROJECT_FILE_ARGUMENTS, DEBUG_STATE_CALLS, HEADLESS_OPERATIONS, PROJECT_INFO_SECTIONS, RUNNER_DIRECTORY = "addons/gdUnit4/";
 var init_server3 = __esm(() => {
   init_mcp();
   init_stdio2();
@@ -38926,6 +39033,7 @@ that is running, and the project on disk. ${TOOL_SPECS.length} tools, named \`do
 | Find a control by the word on it | \`runtime_inspect find\` with \`says\`, rather than listing a screen and reading each one |
 | Where a control is, and whether it is visible | \`runtime_inspect\` \`find\`, \`rect\` |
 | What a property reads right now | \`runtime_inspect\` \`property\`, \`runtime_invoke\` |
+| What a property on an object a node holds reads | the same two, with colons: \`_game:clock:speed\` |
 | 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\` with \`replace\`; a submitted field has to be clicked again |
 | Click somebody standing in a 3D room | \`runtime_input click\` on the Node3D, which aims at what it draws |

package/build/godot/addons/gdharness_editor/bridge_client.gd

@@ -18,6 +18,10 @@ const ANNOUNCE_PROTOCOL: int = 1
 const RECONNECT_DELAY: float = 3.0
 const MAX_RECONNECT_DELAY: float = 30.0
 
+## What a server closes with when the editor that said hello belongs to another project. Kept in
+## step with `OTHER_PROJECT_CLOSE_CODE` in src/godot-bridge.ts.
+const ELSEWHERE_CLOSE_CODE: int = 4001
+
 ## Where Godot keeps the three ports an editor serves. None of them is per editor: the settings
 ## file is one for every editor on the machine, so two open at once want the same three and the
 ## second one binds nothing.
@@ -67,6 +71,10 @@ var _since_looked: float = 0.0
 ## anything connects or the project names a different one.
 var _refused_url: String = ""
 var _tried_announced: bool = false
+
+## The address this editor has already been told is another project's, so a reconnect loop says it
+## once rather than every few seconds for the rest of the session.
+var _told_about_url: String = ""
 var _connecting_for: float = 0.0
 
 
@@ -343,12 +351,35 @@ func _loaded_version() -> String:
 
 func _handle_disconnect() -> void:
 	_is_connected = false
+	_said_elsewhere()
 	disconnected.emit()
 
 	if _should_reconnect:
 		_schedule_reconnect()
 
 
+## Says so when the server turned this editor away as another project's.
+##
+## The fallback address is tried by every project whose own server has not run yet and so has
+## announced nothing, which means any server holding it took the connection and served it. It is
+## refused now, and the refusal is worth a person's attention rather than a quiet backoff: nothing
+## about waiting reaches a server that is not this project's, and the answer is to start one.
+##
+## Said once per address. This is a reconnect loop, and a line every few seconds for the rest of
+## the session is a line nobody reads.
+func _said_elsewhere() -> void:
+	if socket.get_close_code() != ELSEWHERE_CLOSE_CODE:
+		return
+	if _told_about_url == server_url:
+		return
+	_told_about_url = server_url
+	var said: String = (
+		"[gdharness] %s is another project's server, so this editor is not connected: %s."
+		+ " Start this project's own server, or point it at one with GDHARNESS_BRIDGE_PORT."
+	)
+	push_warning(said % [server_url, socket.get_close_reason()])
+
+
 func _schedule_reconnect() -> void:
 	if _reconnect_timer == null:
 		return

package/build/godot/addons/gdharness_runtime/runtime_capture.gd

@@ -2,6 +2,8 @@ extends RefCounted
 
 ## A picture of the running game, as a PNG written where the server asked for it.
 
+const Values = preload("runtime_values.gd")
+
 var _host: Node
 
 
@@ -18,9 +20,10 @@ func capture_viewport(params: Dictionary) -> Dictionary:
 	if viewport_path.is_empty():
 		return capture_screenshot(params)
 
-	var node: Node = _host.get_tree().root.get_node_or_null(viewport_path)
-	if node == null:
-		return {"type": "error", "message": "Viewport not found: " + viewport_path}
+	var standing: Dictionary = Values.node_at(_host.get_tree().root, viewport_path)
+	if standing.has("message"):
+		return standing
+	var node: Node = standing["node"]
 	if not node is Viewport:
 		return {"type": "error", "message": "Node is not a Viewport: " + viewport_path}
 	return _capture(node, params)

package/build/godot/addons/gdharness_runtime/runtime_input.gd

@@ -162,8 +162,9 @@ func inject_key(params: Dictionary) -> Dictionary:
 ## back now rather than echoed from the request, so a call that typed somewhere unhelpful says so.
 func inject_text(params: Dictionary) -> Dictionary:
 	var text: String = String(params.get("text", ""))
-	if text.is_empty():
-		return {"type": "error", "message": "text required"}
+	var over: bool = bool(params.get("replace", false))
+	if text.is_empty() and not over:
+		return {"type": "error", "message": "text needs something to type, or replace to empty a field"}
 
 	var viewport: Viewport = _host.get_tree().root
 	var focused: Control = viewport.gui_get_focus_owner()
@@ -171,14 +172,13 @@ func inject_text(params: Dictionary) -> Dictionary:
 	if not shut.is_empty():
 		return {"type": "error", "message": shut}
 
-	var replaced: bool = bool(params.get("replace", false)) and _select_everything(focused)
+	var replaced: bool = over and _select_everything(focused)
+	# Emptying a field is a real thing to ask for and the one shape of filling one in that types no
+	# characters. The selection is standing, so the key a player presses over one is what clears it.
+	if replaced and text.is_empty():
+		_press(viewport, _held_down(KEY_DELETE))
 	for index: int in text.length():
-		var down: InputEventKey = _typed(text.unicode_at(index))
-		viewport.push_input(down)
-		# The release as well, so nothing is left held down behind the caller.
-		var up: InputEventKey = down.duplicate()
-		up.pressed = false
-		viewport.push_input(up)
+		_press(viewport, _typed(text.unicode_at(index)))
 
 	# Where it went, which is the one thing a caller cannot see from here. Null is a game reading
 	# keys for itself with nothing focused, which is a real thing to be typing at.
@@ -253,6 +253,24 @@ static func _shut_to_typing(focused: Control) -> String:
 
 
 ## The key press that produces [param glyph], as a keyboard would send it.
+## A whole press: down, then the release, so nothing is left held down behind the caller.
+static func _press(viewport: Viewport, down: InputEventKey) -> void:
+	viewport.push_input(down)
+	var up: InputEventKey = down.duplicate()
+	up.pressed = false
+	viewport.push_input(up)
+
+
+## A key held down by its keycode, for the ones that stand for an edit rather than a character.
+static func _held_down(code: Key) -> InputEventKey:
+	var event: InputEventKey = InputEventKey.new()
+	event.pressed = true
+	event.keycode = code
+	event.physical_keycode = code
+	event.key_label = code
+	return event
+
+
 func _typed(glyph: int) -> InputEventKey:
 	var event: InputEventKey = InputEventKey.new()
 	event.pressed = true
@@ -422,9 +440,10 @@ func click(params: Dictionary) -> Dictionary:
 	if node_path.is_empty():
 		return {"type": "error", "message": "Node path required"}
 
-	var node: Node = _host.get_tree().root.get_node_or_null(node_path)
-	if node == null:
-		return {"type": "error", "message": "Node not found: " + node_path}
+	var standing: Dictionary = Values.node_at(_host.get_tree().root, node_path)
+	if standing.has("message"):
+		return standing
+	var node: Node = standing["node"]
 	if node is Node3D:
 		return await _click_in_the_world(node_path, node, params)
 	if not node is Control:
@@ -562,9 +581,10 @@ func choose(params: Dictionary) -> Dictionary:
 	var node_path: String = str(params.get("path", ""))
 	if node_path.is_empty():
 		return {"type": "error", "message": "Node path required"}
-	var node: Node = _host.get_tree().root.get_node_or_null(node_path)
-	if node == null:
-		return {"type": "error", "message": "Node not found: " + node_path}
+	var standing: Dictionary = Values.node_at(_host.get_tree().root, node_path)
+	if standing.has("message"):
+		return standing
+	var node: Node = standing["node"]
 
 	var menu: PopupMenu = _menu_of(node)
 	if menu == null: