gdharness 1.2.30 → 1.2.31

package/build/index.js

@@ -29053,6 +29053,9 @@ class GodotBridge extends EventEmitter {
     const info = this.connectionInfo;
     return this.socket?.readyState === import_websocket.default.OPEN && info !== null && (info.greeted !== true || info.identifying === true);
   }
+  requestsInFlight() {
+    return [...this.pendingRequests.values()].filter((pending) => pending.counted).map((pending) => ({ tool: pending.toolName, startedAt: pending.startedAt })).sort((a, b) => a.startedAt - b.startedAt);
+  }
   getStatus() {
     const identifying = this.connectionInfo?.identifying === true;
     const editor = identifying ? null : this.connectionInfo;
@@ -29074,18 +29077,19 @@ class GodotBridge extends EventEmitter {
       syncsBreakpoints: editor?.syncsBreakpoints,
       turnedAway: this.turnedAway ?? undefined,
       identifying: identifying ? true : undefined,
-      pendingRequests: this.pendingRequests.size,
+      pendingRequests: this.requestsInFlight().length,
       queuedResources: this.resourceQueues.size,
       listeningSince: this.listeningSince ?? undefined,
       portWanted: this.wantedPort !== 0 && this.boundPort !== null && this.boundPort !== this.wantedPort ? this.wantedPort : undefined
     };
   }
-  invokeTool(toolName, args) {
+  invokeTool(toolName, args, options = {}) {
+    const counted = options.counted ?? true;
     const resourceKey = this.getResourceKey(args);
     if (!resourceKey) {
-      return this.invokeToolDirect(toolName, args);
+      return this.invokeToolDirect(toolName, args, counted);
     }
-    return this.enqueueResourceRequest(resourceKey, () => this.invokeToolDirect(toolName, args, resourceKey));
+    return this.enqueueResourceRequest(resourceKey, () => this.invokeToolDirect(toolName, args, counted, resourceKey));
   }
   getRequestPathname(url) {
     try {
@@ -29237,7 +29241,7 @@ class GodotBridge extends EventEmitter {
         return;
     }
   }
-  invokeToolDirect(toolName, args, resourceKey) {
+  invokeToolDirect(toolName, args, counted, resourceKey) {
     if (!this.isConnected()) {
       return Promise.reject(new Error("Godot is not connected"));
     }
@@ -29259,7 +29263,8 @@ class GodotBridge extends EventEmitter {
         resolve,
         reject,
         startedAt: Date.now(),
-        resourceKey
+        resourceKey,
+        counted
       });
       this.emitBridgeEvent("tool_start", {
         tool: toolName,
@@ -31352,11 +31357,26 @@ function shownDiagnostic(entry) {
     ...code === undefined || code === null || code === 0 || code === "" ? {} : { code }
   };
 }
-function shownSymbol(entry) {
+function linesIn(content) {
+  const lines = content.split(`
+`);
+  return Math.max(1, content.endsWith(`
+`) ? lines.length - 1 : lines.length);
+}
+function lastLineOf(whole, lastOfDocument) {
+  const end = shownPosition(whole["end"]);
+  if (end === null) {
+    return null;
+  }
+  const start = shownPosition(whole["start"]);
+  const exclusive = end.column === 1 && (start === null || end.line > start.line);
+  return Math.min(exclusive ? end.line - 1 : end.line, lastOfDocument);
+}
+function shownSymbol(entry, lastOfDocument) {
   const symbol = asRecord(entry);
   const whole = asRecord(symbol["range"] ?? asRecord(symbol["location"])["range"]);
   const at = shownPosition(asRecord(symbol["selectionRange"] ?? whole)["start"]);
-  const last = shownPosition(whole["end"]);
+  const last = lastLineOf(whole, lastOfDocument);
   const children = Array.isArray(symbol["children"]) ? symbol["children"] : [];
   const { documentation, native_class: nativeClass, deprecated, detail } = symbol;
   return {
@@ -31364,11 +31384,11 @@ function shownSymbol(entry) {
     kind: named(symbol["kind"], SYMBOL_KINDS),
     ...typeof detail === "string" && detail !== "" ? { detail } : {},
     ...at === null ? {} : { line: at.line, column: at.column },
-    ...last === null ? {} : { lastLine: last.line },
+    ...last === null ? {} : { lastLine: last },
     ...typeof documentation === "string" && documentation !== "" ? { documentation } : {},
     ...typeof nativeClass === "string" && nativeClass !== "" ? { nativeClass } : {},
     ...deprecated === true ? { deprecated } : {},
-    ...children.length > 0 ? { children: children.map(shownSymbol) } : {}
+    ...children.length > 0 ? { children: children.map((child) => shownSymbol(child, lastOfDocument)) } : {}
   };
 }
 var MOST_COMPLETIONS = 100;
@@ -31473,7 +31493,7 @@ async function handleLSPTool(client, toolName, args) {
       }
       case "lsp_get_symbols": {
         const symbols = await client.getDocumentSymbols(scriptPath, content);
-        return asToolResponse({ symbols: symbols.map(shownSymbol) });
+        return asToolResponse({ symbols: symbols.map((symbol) => shownSymbol(symbol, linesIn(content))) });
       }
       default:
         return asToolResponse({ error: `Unknown LSP tool: ${toolName}` });
@@ -34298,7 +34318,7 @@ var NODE_PATH = {
 };
 var PROPERTIES = {
   type: "object",
-  description: 'Properties to set, keyed by Godot property name. Vectors, colours and the like may be written as {"x": 1, "y": 2} or tagged {"_type": "Vector2", "x": 1, "y": 2}, which is the form a read answers with, so a value read off one node can be written straight to another. A property holding a node takes the path to it from the node being set, such as "../Player". Each value is read back once set, and one the engine changed or refused is refused with what it holds.',
+  description: 'Properties to set, keyed by Godot property name. Vectors, colours and the like may be written as {"x": 1, "y": 2} or tagged {"_type": "Vector2", "x": 1, "y": 2}, which is the form a read answers with, so a value read off one node can be written straight to another. A key may also be a colon path into one of the components of a vector, a colour, a rectangle or a transform, as GDScript names them, so one axis is written alone: "position:x", "modulate:a", "region_rect:size:y"; a component the value does not have is refused, naming the ones it has. A property holding a node takes the path to it from the node being set, such as "../Player". Each value is read back once set, and one the engine changed or refused is refused with what it holds.',
   additionalProperties: true
 };
 var XY = {
@@ -34753,7 +34773,11 @@ var TOOL_SPECS = [
     requires: ["projectPath", "scenePath"],
     operations: {
       create: { effect: "destructive", summary: "a new scene with one root node", requires: [] },
-      save: { effect: "destructive", summary: "save the scene as it is in the editor", requires: [] },
+      save: {
+        effect: "destructive",
+        summary: "save the scene as it is in the editor, or as the file loads when the editor does not have it open; from says which",
+        requires: []
+      },
       save_as: { effect: "destructive", summary: "save a copy under newPath", requires: ["newPath"] }
     },
     defaultOperation: "create"
@@ -34801,7 +34825,11 @@ var TOOL_SPECS = [
     requires: ["projectPath", "scenePath"],
     operations: {
       add: { effect: "additive", summary: "add a node of any class", requires: ["nodeType", "nodeName"] },
-      get: { effect: "read", summary: "read a node's properties", requires: ["nodePath"] },
+      get: {
+        effect: "read",
+        summary: "read a node's properties, and a TileMapLayer's or TileMap's cells as set_tilemap_cells takes them, the first 1000 with cellCount for all",
+        requires: ["nodePath"]
+      },
       set: {
         effect: "destructive",
         summary: "set properties on a node",
@@ -34828,7 +34856,7 @@ var TOOL_SPECS = [
   {
     name: "scene_signal",
     title: "Scene signals",
-    description: "Signal connections in a scene file. Each connection answers with its flags as the number and as flagNames; persist is on every connection, since a scene saves no other kind. Needs the editor connected.",
+    description: "Signal connections in a scene file. Each connection answers with its flags as the number and as flagNames; persist is on every connection, since a scene saves no other kind. A connect of a pair already connected says alreadyConnected, with flagsBefore when it changed the flags. Needs the editor connected.",
     parameters: {
       projectPath: PROJECT_PATH2,
       scenePath: SCENE_PATH,
@@ -38206,7 +38234,7 @@ class GodotServer {
     const { op: _op, ...arguments_ } = args;
     const bridge = async (command, extra = {}) => {
       const contained = this.containProjectFiles({ ...arguments_, ...extra });
-      return contained.ok ? await this.handleViaBridge(command, contained.value, tool) : contained.response;
+      return contained.ok ? await this.handleViaBridge(command, contained.value, op === "" ? tool : `${tool} ${op}`) : contained.response;
     };
     switch (tool) {
       case "project_info":
@@ -38936,8 +38964,30 @@ class GodotServer {
         ]
       };
     }
+    const dropped = await this.optionsTheImporterDropped(project.value.path, params, written.payload);
+    if (dropped !== null) {
+      return dropped;
+    }
     return this.jsonTextResponse({ ...written.payload, reimport: applied.payload });
   }
+  async optionsTheImporterDropped(projectPath, params, written) {
+    const listed = written["updated_options"];
+    const updated = Array.isArray(listed) ? listed.map(String) : [];
+    const { options: _options, ...where } = params;
+    const reread = await this.operation("get_import_options", where, projectPath);
+    if (!reread.ok || updated.length === 0) {
+      return null;
+    }
+    const held = reread.payload["params"];
+    const kept = held !== null && typeof held === "object" ? Object.keys(held) : [];
+    const gone = updated.filter((name) => !kept.includes(name));
+    if (gone.length === 0) {
+      return null;
+    }
+    const applied = updated.filter((name) => kept.includes(name));
+    const named = gone.join(", ");
+    return this.createErrorResponse(`${named} ${gone.length === 1 ? "is not an option" : "are not options"} of this resource's importer: the reimport left ${gone.length === 1 ? "it" : "them"} out of the import file, so ${gone.length === 1 ? "it changed" : "they changed"} nothing.${applied.length === 0 ? "" : ` ${applied.join(", ")} ${applied.length === 1 ? "was" : "were"} applied.`} Its options are: ${kept.join(", ")}.`, ["project_import options lists every option with the value it holds"]);
+  }
   async reimport(projectPath, resourcePath, force, timeoutMs) {
     const ask = resourcePath === undefined ? { includeUpToDate: force } : { resourcePath };
     const before = await this.operation("get_import_status", ask, projectPath);
@@ -40037,7 +40087,7 @@ class GodotServer {
     }
     try {
       const askedAt = Date.now();
-      const asked = this.godotBridge.invokeTool("playing_status", {});
+      const asked = this.godotBridge.invokeTool("playing_status", {}, { counted: false });
       const answer = await Promise.race([asked, delay4(PLAYING_STATUS_MS).then(() => null)]);
       if (answer === null) {
         this.logDebug(`playing_status did not answer within ${PLAYING_STATUS_MS}ms`);
@@ -40062,7 +40112,7 @@ class GodotServer {
     }
     try {
       const answer = await Promise.race([
-        this.godotBridge.invokeTool("scan_status", {}),
+        this.godotBridge.invokeTool("scan_status", {}, { counted: false }),
         delay4(PLAYING_STATUS_MS).then(() => null)
       ]);
       if (answer === null) {
@@ -40130,10 +40180,14 @@ class GodotServer {
       this.getEditorStatusPayload(),
       this.editorServersListening()
     ]);
+    const answeredAt = Date.now();
+    const inFlight = this.godotBridge.requestsInFlight().map((request) => ({ tool: request.tool, forMs: answeredAt - request.startedAt }));
     return this.jsonTextResponse({
       editor: {
         ...editorStatus,
         ...servers,
+        pendingRequests: inFlight.length,
+        pendingRequestTools: inFlight.length === 0 ? undefined : inFlight,
         debugPort: playing?.debugPort ?? this.godotBridge.getStatus().debugPort,
         scan
       },
@@ -42721,14 +42775,16 @@ class GodotServer {
     if (!(answered instanceof BridgeTimeout)) {
       return answered;
     }
-    return this.createErrorResponse(`The editor took ${toolName} in and did not answer within ${String(answered.waitedMs / 1000)}s. An editor importing files answers nothing until the import is over, and a hidden one imports on the thread that answers.`, [
+    return this.createErrorResponse(`The editor took ${askedAs ?? toolName} in and did not answer within ${String(answered.waitedMs / 1000)}s. An editor importing files answers nothing until the import is over, and a hidden one imports on the thread that answers.`, [
       "editor_status says whether it is scanning or importing",
       "The editor still carries the request out once it is free, so read what it changed before asking again"
     ]);
   }
   async askViaBridge(toolName, args, askedAs) {
+    const named = askedAs ?? toolName;
     if (!this.godotBridge.isConnected()) {
-      const alternative = askedAs !== undefined && Object.hasOwn(EDITOR_FREE_INSTEAD, askedAs) ? EDITOR_FREE_INSTEAD[askedAs] : undefined;
+      const tool = askedAs?.split(" ")[0];
+      const alternative = tool !== undefined && Object.hasOwn(EDITOR_FREE_INSTEAD, tool) ? EDITOR_FREE_INSTEAD[tool] : undefined;
       const refused = await this.noEditorYet(args, alternative === undefined ? [] : [alternative]);
       if (refused !== null) {
         return refused;
@@ -42752,9 +42808,9 @@ class GodotServer {
       if (message.includes(`Unknown tool: ${toolName}`)) {
         const status = this.godotBridge.getStatus();
         const remedy = addonMismatch(status.addonVersion, SERVER_VERSION, status.addonDigest, shippedEditorDigest(), this.editorCodeOnDisk());
-        return this.createErrorResponse(`The editor's gdharness addon is older than this ${SERVER_VERSION} server and has no ${toolName}, so it cannot answer this call. ${remedy ?? "Restart it with editor_launch restart to load the addon the project holds."}`, ["editor_status says which addon the editor holds"]);
+        return this.createErrorResponse(`The editor's gdharness addon is older than this ${SERVER_VERSION} server and has no ${named}, so it cannot answer this call. ${remedy ?? "Restart it with editor_launch restart to load the addon the project holds."}`, ["editor_status says which addon the editor holds"]);
       }
-      return this.createErrorResponse(`The editor answered ${toolName} with an error: ${message}`);
+      return this.createErrorResponse(`The editor answered ${named} with an error: ${message}`);
     }
   }
   runtimeTimeoutMs() {

package/package.json

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