gdharness 1.1.33 → 1.1.35

package/build/cli.js

@@ -17758,7 +17758,7 @@ var init_tool_definitions = __esm(() => {
     },
     {
       name: "script_edit",
-      description: "Creates a GDScript file, or adds functions, variables and signals to one. Every declaration written carries a type. Both load what they wrote under the project's own warning settings and answer with parses; the engine's reasons for a refusal come back under engine_messages. create answers with the extends and class_name the engine read, and a script declaring a class_name is put in the project's class list, with registered saying whether it is there. modify makes every addition or none, and answers with the line each one is on in the file written. rename renames a class or a member wherever the engine uses it and writes every file or none: changed lists each file with its changed lines as they now read, and leftAlone lists every other whole-word occurrence of the old name with what the tokenizer makes of it (code, string, comment, doc, nodePath, scene, text, or ignored for a file under a .gdignore directory, which is never changed) and, where it is not plain, why: a find_children string, a word in a comment, a node named like the class, a call on a value whose type the analyser could not tell. Read leftAlone before calling the rename done; nothing in it was changed. Afterwards an open editor scans the changed files and reloads every changed script, which is also the compile check, and its answer comes back under editor; with no editor the class cache is rebuilt and the changed scripts are compiled in a fresh engine, under classCache and compiled.",
+      description: "Creates a GDScript file, or adds functions, variables and signals to one. Every declaration written carries a type. Both load what they wrote under the project's own warning settings and answer with parses; the engine's reasons for a refusal come back under engine_messages. create answers with the extends and class_name the engine read, and a script declaring a class_name is put in the project's class list, with registered saying whether it is there. modify makes every addition or none, and answers with the line each one is on in the file written. rename renames a class or a member wherever the engine uses it and writes every file or none. A new name already taken is refused with nothing written, a member's included when a class inheriting it already uses the name in code, as a local or a parameter. changed lists each file with its changed lines as they now read, and leftAlone lists every other whole-word occurrence of the old name with what the tokenizer makes of it (code, string, comment, doc, nodePath, scene, text, or ignored for a file under a .gdignore directory, which is never changed) and, where it is not plain, why: a string that is the old name whole, such as find_children's type or a call's method name, which nothing renames or compiles and which is listed first; a node named like the class; a call on a value whose type the analyser could not tell. A member rename answers under languageServer how many requests it made and how long they took. A comment or a line of a text file with nothing more to say is given under leftAloneInProse by file and line instead. Read both before calling the rename done; nothing in them was changed. Afterwards an open editor scans the changed files and reloads every changed script, which is also the compile check, and its answer comes back under editor; with no editor the class cache is rebuilt and the changed scripts are compiled in a fresh engine, under classCache and compiled. written is true once the files are written, and ok is false when what came after the write failed: the files are left changed, and note says so.",
       parameters: {
         projectPath: PROJECT_PATH,
         scriptPath: SCRIPT_PATH,
@@ -38854,9 +38854,11 @@ class GodotLSPClient {
   diagnosticsWaiters = new Map;
   documentVersions = new Map;
   documentTurns = new Map;
-  constructor(port = portFromEnv("GDHARNESS_LSP_PORT", DEFAULT_LSP_PORT), host = "127.0.0.1") {
+  timeouts;
+  constructor(port = portFromEnv("GDHARNESS_LSP_PORT", DEFAULT_LSP_PORT), host = "127.0.0.1", timeouts = { requestMs: REQUEST_TIMEOUT_MS2, referencesMs: REFERENCES_TIMEOUT_MS }) {
     this.port = port;
     this.host = host;
+    this.timeouts = timeouts;
     this.pendingRequests = new Map;
   }
   async connect() {
@@ -38953,7 +38955,7 @@ class GodotLSPClient {
     const rootPath = this.rootPath ?? dirname13(resolve5(filePath));
     await this.initialize(rootPath);
   }
-  async sendRequest(method, params) {
+  async sendRequest(method, params, timeoutMs = this.timeouts.requestMs) {
     await this.ensureConnected();
     if (!this.socket) {
       throw new Refusal("Not connected to Godot LSP");
@@ -38970,8 +38972,8 @@ class GodotLSPClient {
     return new Promise((resolveRequest, rejectRequest) => {
       const timer = setTimeout(() => {
         this.pendingRequests.delete(id);
-        rejectRequest(new Error(`LSP request timed out after 10s: ${method}`));
-      }, 1e4);
+        rejectRequest(new LSPTimeout(method, timeoutMs));
+      }, timeoutMs);
       this.pendingRequests.set(id, {
         resolve: resolveRequest,
         reject: rejectRequest,
@@ -39276,7 +39278,7 @@ class GodotLSPClient {
           textDocument: { uri },
           position: { line, character },
           context: { includeDeclaration: true }
-        });
+        }, this.timeouts.referencesMs);
       } finally {
         this.closeDocument(uri);
       }
@@ -39434,12 +39436,21 @@ async function handleLSPTool(client, toolName, args) {
     });
   }
 }
-var DEFAULT_LSP_PORT = 6005, DIAGNOSTICS_TIMEOUT_MS = 5000, ArgumentRefusal, AnotherProjectsServer;
+var DEFAULT_LSP_PORT = 6005, DIAGNOSTICS_TIMEOUT_MS = 5000, REQUEST_TIMEOUT_MS2 = 1e4, REFERENCES_TIMEOUT_MS = 180000, LSPTimeout, ArgumentRefusal, AnotherProjectsServer;
 var init_lsp_client = __esm(() => {
   init_errors();
   init_framing();
   init_paths();
   init_ports();
+  LSPTimeout = class LSPTimeout extends Error {
+    method;
+    seconds;
+    constructor(method, timeoutMs) {
+      super(`LSP request timed out after ${String(timeoutMs / 1000)}s: ${method}`);
+      this.method = method;
+      this.seconds = timeoutMs / 1000;
+    }
+  };
   ArgumentRefusal = class ArgumentRefusal extends Refusal {
   };
   AnotherProjectsServer = class AnotherProjectsServer extends Refusal {
@@ -40061,6 +40072,10 @@ class PlanBuilder {
     return { edits, mentions };
   }
 }
+function isWholeString(text, offset, name) {
+  const before = text[offset - 1];
+  return (before === '"' || before === "'") && text[offset + name.length] === before;
+}
 function declaresItsOwn(script, name, except) {
   return script.occurrences(name).some((occurrence) => occurrence.kind === "code" && occurrence.offset !== except && occurrence.declaredAs !== null && occurrence.declaredAs !== "class_name");
 }
@@ -40101,6 +40116,9 @@ function planClassRename(args) {
   }
   plan.mentionTheRest(texts, scripts, (file, occurrence, kind) => {
     const script = scripts.get(file);
+    if (kind === "string" && script !== undefined && isWholeString(script.text, occurrence.offset, oldName)) {
+      return WHOLE_CLASS_NAME;
+    }
     if (kind !== "code" || script === undefined) {
       return;
     }
@@ -40167,7 +40185,16 @@ function planMemberRename(args) {
     }
   }
   planScenes(texts, heirs, kind, oldName, plan);
-  plan.mentionTheRest(texts, scripts, (_file, occurrence, mentionKind) => mentionKind === "code" ? occurrence.afterDot ? "not resolved to this member by the language server: another class with a member of the same name, or a value whose type the analyser could not tell" : "not resolved to this member by the language server" : undefined);
+  plan.mentionTheRest(texts, scripts, (file, occurrence, mentionKind) => {
+    const script = scripts.get(file);
+    if (mentionKind === "string" && script !== undefined && isWholeString(script.text, occurrence.offset, oldName)) {
+      return WHOLE_MEMBER_NAME;
+    }
+    if (mentionKind !== "code") {
+      return;
+    }
+    return occurrence.afterDot ? "not resolved to this member by the language server: another class with a member of the same name, or a value whose type the analyser could not tell" : "not resolved to this member by the language server";
+  });
   return plan.build();
 }
 function sectionsOf(text) {
@@ -40503,7 +40530,7 @@ function applyRewrites(rewrites) {
     throw error;
   }
 }
-var DOC_LINK_KINDS, DOC_KIND;
+var DOC_LINK_KINDS, DOC_KIND, WHOLE_CLASS_NAME = "the whole string is the class's name, as find_children's type, a comparison with get_global_name() or a list of accepted type names takes it, and it was not changed: if it names this class, it no longer matches anything after the rename, and no compile says so", WHOLE_MEMBER_NAME = "the whole string is the member's name, as call, connect, has_method, get or set take it, and it was not changed: if it names this member, it no longer finds it after the rename, and no compile says so";
 var init_rename = __esm(() => {
   init_gdscript_source();
   DOC_LINK_KINDS = new Set([
@@ -40612,6 +40639,7 @@ async function renameSymbol(request, services) {
   let plan;
   let what;
   let resolvedBy;
+  let took = null;
   let overrides = [];
   let declaringFiles = [declaringPath];
   if (isClass) {
@@ -40684,6 +40712,20 @@ async function renameSymbol(request, services) {
         conflicts.push(`${newName} is already declared in ${id.endsWith("#") ? fileOf(id) : `${fileOf(id)}, class ${id.slice(id.lastIndexOf("#") + 1)}`}`);
       }
     }
+    const heirs = graph.descendants(root);
+    const inUse = [];
+    for (const script of scripts.values()) {
+      for (const occurrence of script.occurrences(newName)) {
+        const body = graph.bodyAt(script.path, occurrence.offset);
+        if (occurrence.kind === "code" && !occurrence.afterDot && heirs.has(body) && graph.declaration(body, newName)?.offset !== occurrence.offset) {
+          inUse.push({ file: script.path, line: script.lines.positionOf(occurrence.offset).line + 1 });
+        }
+      }
+    }
+    if (inUse.length > 0) {
+      const places = inUse.sort((a, b) => a.file.localeCompare(b.file) || a.line - b.line).slice(0, 10).map((place) => `${place.file}:${place.line}`);
+      conflicts.push(`${newName} is already used in code where ${symbol} is inherited, as a local, a parameter or another name the renamed ${what} would shadow or be shadowed by, at ${places.join(", ")}${inUse.length > places.length ? ` and ${inUse.length - places.length} more` : ""}`);
+    }
     if (conflicts.length > 0) {
       return {
         ok: false,
@@ -40704,7 +40746,23 @@ async function renameSymbol(request, services) {
     }
     overrides = family.map((one) => one.file).filter((file) => file !== fileOf(root));
     declaringFiles = family.map((one) => one.file);
-    const resolved = await resolveMember(projectPath, texts, scripts, family, symbol, services);
+    took = { references: { asked: 0, ms: 0 }, definitions: { asked: 0, ms: 0 } };
+    let resolved;
+    try {
+      resolved = await resolveMember(projectPath, texts, scripts, family, symbol, services, took);
+    } catch (error) {
+      if (!(error instanceof LSPTimeout)) {
+        throw error;
+      }
+      return {
+        ok: false,
+        reason: `The editor's language server took the ${error.method} request for ${symbol} and had not answered it after ${String(error.seconds)}s, so nothing was renamed.${error.method === "textDocument/references" ? " Godot answers a references request by looking for the name's text in every script and resolving each match, so a name also written as a common local takes longest." : ""}`,
+        advice: [
+          "script_diagnostics on the declaring script says whether the language server is answering other requests",
+          "The request that ran out is still being answered by the editor, and another sent now waits behind it"
+        ]
+      };
+    }
     if (resolved === null) {
       const first = family[0];
       const script = first === undefined ? undefined : scripts.get(first.file);
@@ -40752,15 +40810,16 @@ async function renameSymbol(request, services) {
     rewrites,
     report: {
       renamed: { what, from: symbol, to: newName, declaredIn: declaringPath, resolvedBy },
+      ...took === null ? {} : { languageServer: took },
       ...overrides.length > 0 ? { overridesRenamed: overrides } : {},
       ...moveTo === null ? {} : { moved: { from: declaringPath, to: moveTo } },
       changed: changedReport(plan.edits, rewrites),
-      leftAlone: plan.mentions,
+      ...leftAloneReport(plan.mentions),
       summary: summaryOf(plan.edits, plan.mentions, rewrites)
     }
   };
 }
-async function resolveMember(projectPath, texts, scripts, family, name, services) {
+async function resolveMember(projectPath, texts, scripts, family, name, services, took) {
   const absoluteOf = new Map(texts.map((file) => [file.path, file.absolute]));
   const key = (place) => `${place.file}:${place.offset}`;
   const toResolved = (located) => {
@@ -40774,11 +40833,16 @@ async function resolveMember(projectPath, texts, scripts, family, name, services
     if (script === undefined || absolute === undefined) {
       return [];
     }
-    const answered = await services[question](absolute, script.text, script.lines.positionOf(place.offset));
-    return answered.map(toResolved).filter((one) => one !== null);
+    const started = performance.now();
+    try {
+      const answered = await services[question](absolute, script.text, script.lines.positionOf(place.offset));
+      return answered.map(toResolved).filter((one) => one !== null);
+    } finally {
+      took[question].asked += 1;
+      took[question].ms += Math.round(performance.now() - started);
+    }
   };
   const ours = new Map;
-  const settled = new Set;
   const root = family[0];
   if (root === undefined) {
     return [];
@@ -40794,23 +40858,13 @@ async function resolveMember(projectPath, texts, scripts, family, name, services
   for (const script of scripts.values()) {
     for (const occurrence of script.occurrences(name)) {
       const place = { file: script.path, offset: occurrence.offset };
-      if (occurrence.kind !== "code" || ours.has(key(place)) || settled.has(key(place))) {
+      if (occurrence.kind !== "code" || ours.has(key(place))) {
         continue;
       }
       const declared = await ask("definitions", place);
       const only = declared.length === 1 ? declared[0] : undefined;
-      if (only === undefined) {
-        settled.add(key(place));
-        continue;
-      }
-      const isOurs = declarations.has(key(only));
-      const same = [place, ...await ask("references", place)];
-      for (const one of same) {
-        if (isOurs) {
-          ours.set(key(one), one);
-        } else {
-          settled.add(key(one));
-        }
+      if (only !== undefined && declarations.has(key(only))) {
+        ours.set(key(place), place);
       }
     }
   }
@@ -40850,6 +40904,28 @@ function changedReport(edits, rewrites) {
     };
   });
 }
+function leftAloneReport(mentions) {
+  const full = [];
+  const prose = new Map;
+  for (const mention of mentions) {
+    if ((mention.kind === "comment" || mention.kind === "text") && mention.why === undefined) {
+      const key = `${mention.file}
+${mention.kind}`;
+      const group = prose.get(key) ?? { file: mention.file, kind: mention.kind, lines: [] };
+      if (!group.lines.includes(mention.line)) {
+        group.lines.push(mention.line);
+      }
+      prose.set(key, group);
+    } else {
+      full.push(mention);
+    }
+  }
+  const loudFirst = (mention) => mention.kind === "string" && mention.why !== undefined ? 0 : 1;
+  return {
+    leftAlone: full.sort((a, b) => loudFirst(a) - loudFirst(b)),
+    ...prose.size > 0 ? { leftAloneInProse: [...prose.values()] } : {}
+  };
+}
 function summaryOf(edits, mentions, rewrites) {
   const count = (values) => {
     const counted = {};
@@ -40869,6 +40945,7 @@ function summaryOf(edits, mentions, rewrites) {
 var WHAT;
 var init_rename_symbol = __esm(() => {
   init_gdscript_source();
+  init_lsp_client();
   init_project_scan();
   init_rename();
   init_resources();
@@ -45946,7 +46023,9 @@ class GodotServer {
         }
         return await question(client);
       } catch (error) {
-        languageServer.problem = normalizeLSPError(error, client.port);
+        if (!(error instanceof LSPTimeout)) {
+          languageServer.problem = normalizeLSPError(error, client.port);
+        }
         throw error;
       }
     };
@@ -45995,7 +46074,18 @@ class GodotServer {
       rebuildCache: outcome.isClass || outcome.moved !== null,
       moved: outcome.moved !== null
     });
-    return this.jsonTextResponse({ ok: settled.ok, ...outcome.report, ...settled.report });
+    const said = readString(settled.report, "note");
+    const leftChanged = settled.ok ? said : [
+      "The rename was written: every file under changed now reads as shown there and is left that way. ok is false for what came after the write, said under editor or compiled.",
+      ...said === undefined ? [] : [said]
+    ].join(" ");
+    return this.jsonTextResponse({
+      ok: settled.ok,
+      written: true,
+      ...outcome.report,
+      ...settled.report,
+      ...leftChanged === undefined ? {} : { note: leftChanged }
+    });
   }
   async settleRenameInEditor(projectPath, changed, names) {
     const { gone, oldClass, newClass } = names;
@@ -47697,9 +47787,11 @@ that a setting nobody wrote down still answers with the default the engine regis
 
 To rename a class or a member across the project, use \`script_edit rename\` rather than a text
 replacement: it changes the uses the engine resolves, doc links and what scenes record, and lists
-every other occurrence of the word under \`leftAlone\`, a \`find_children\` string, a word in a
-comment or a file under a \`.gdignore\` directory, for you to read. Pass \`preview\` first on a
-large rename.
+every other occurrence of the word for you to read: a string that is the name whole, such as a
+\`find_children\` type, first under \`leftAlone\` since nothing compiles it, a file under a
+\`.gdignore\` directory there too, and a word in a comment or a text file by line under
+\`leftAloneInProse\`. Pass \`preview\` first on a large rename. If the answer has \`ok: false\`
+beside \`written: true\`, the files were changed and a script did not compile afterwards.
 
 Editing a file while a game is running does not change the running game. \`auto_reload\` is an
 editor plugin and reloads into the editor's own process; the game is a separate process holding

package/build/index.js

@@ -29540,6 +29540,18 @@ import { dirname as dirname8, join as join14, resolve as resolve3 } from "node:p
 import { fileURLToPath, pathToFileURL } from "node:url";
 var DEFAULT_LSP_PORT = 6005;
 var DIAGNOSTICS_TIMEOUT_MS = 5000;
+var REQUEST_TIMEOUT_MS2 = 1e4;
+var REFERENCES_TIMEOUT_MS = 180000;
+
+class LSPTimeout extends Error {
+  method;
+  seconds;
+  constructor(method, timeoutMs) {
+    super(`LSP request timed out after ${String(timeoutMs / 1000)}s: ${method}`);
+    this.method = method;
+    this.seconds = timeoutMs / 1000;
+  }
+}
 
 class ArgumentRefusal extends Refusal {
 }
@@ -29583,9 +29595,11 @@ class GodotLSPClient {
   diagnosticsWaiters = new Map;
   documentVersions = new Map;
   documentTurns = new Map;
-  constructor(port = portFromEnv("GDHARNESS_LSP_PORT", DEFAULT_LSP_PORT), host = "127.0.0.1") {
+  timeouts;
+  constructor(port = portFromEnv("GDHARNESS_LSP_PORT", DEFAULT_LSP_PORT), host = "127.0.0.1", timeouts = { requestMs: REQUEST_TIMEOUT_MS2, referencesMs: REFERENCES_TIMEOUT_MS }) {
     this.port = port;
     this.host = host;
+    this.timeouts = timeouts;
     this.pendingRequests = new Map;
   }
   async connect() {
@@ -29682,7 +29696,7 @@ class GodotLSPClient {
     const rootPath = this.rootPath ?? dirname8(resolve3(filePath));
     await this.initialize(rootPath);
   }
-  async sendRequest(method, params) {
+  async sendRequest(method, params, timeoutMs = this.timeouts.requestMs) {
     await this.ensureConnected();
     if (!this.socket) {
       throw new Refusal("Not connected to Godot LSP");
@@ -29699,8 +29713,8 @@ class GodotLSPClient {
     return new Promise((resolveRequest, rejectRequest) => {
       const timer = setTimeout(() => {
         this.pendingRequests.delete(id);
-        rejectRequest(new Error(`LSP request timed out after 10s: ${method}`));
-      }, 1e4);
+        rejectRequest(new LSPTimeout(method, timeoutMs));
+      }, timeoutMs);
       this.pendingRequests.set(id, {
         resolve: resolveRequest,
         reject: rejectRequest,
@@ -30005,7 +30019,7 @@ class GodotLSPClient {
           textDocument: { uri },
           position: { line, character },
           context: { includeDeclaration: true }
-        });
+        }, this.timeouts.referencesMs);
       } finally {
         this.closeDocument(uri);
       }
@@ -30782,6 +30796,12 @@ class PlanBuilder {
     return { edits, mentions };
   }
 }
+function isWholeString(text, offset, name) {
+  const before = text[offset - 1];
+  return (before === '"' || before === "'") && text[offset + name.length] === before;
+}
+var WHOLE_CLASS_NAME = "the whole string is the class's name, as find_children's type, a comparison with get_global_name() or a list of accepted type names takes it, and it was not changed: if it names this class, it no longer matches anything after the rename, and no compile says so";
+var WHOLE_MEMBER_NAME = "the whole string is the member's name, as call, connect, has_method, get or set take it, and it was not changed: if it names this member, it no longer finds it after the rename, and no compile says so";
 function declaresItsOwn(script, name, except) {
   return script.occurrences(name).some((occurrence) => occurrence.kind === "code" && occurrence.offset !== except && occurrence.declaredAs !== null && occurrence.declaredAs !== "class_name");
 }
@@ -30822,6 +30842,9 @@ function planClassRename(args) {
   }
   plan.mentionTheRest(texts, scripts, (file, occurrence, kind) => {
     const script = scripts.get(file);
+    if (kind === "string" && script !== undefined && isWholeString(script.text, occurrence.offset, oldName)) {
+      return WHOLE_CLASS_NAME;
+    }
     if (kind !== "code" || script === undefined) {
       return;
     }
@@ -30888,7 +30911,16 @@ function planMemberRename(args) {
     }
   }
   planScenes(texts, heirs, kind, oldName, plan);
-  plan.mentionTheRest(texts, scripts, (_file, occurrence, mentionKind) => mentionKind === "code" ? occurrence.afterDot ? "not resolved to this member by the language server: another class with a member of the same name, or a value whose type the analyser could not tell" : "not resolved to this member by the language server" : undefined);
+  plan.mentionTheRest(texts, scripts, (file, occurrence, mentionKind) => {
+    const script = scripts.get(file);
+    if (mentionKind === "string" && script !== undefined && isWholeString(script.text, occurrence.offset, oldName)) {
+      return WHOLE_MEMBER_NAME;
+    }
+    if (mentionKind !== "code") {
+      return;
+    }
+    return occurrence.afterDot ? "not resolved to this member by the language server: another class with a member of the same name, or a value whose type the analyser could not tell" : "not resolved to this member by the language server";
+  });
   return plan.build();
 }
 function sectionsOf(text) {
@@ -31578,6 +31610,7 @@ async function renameSymbol(request, services) {
   let plan;
   let what;
   let resolvedBy;
+  let took = null;
   let overrides = [];
   let declaringFiles = [declaringPath];
   if (isClass) {
@@ -31650,6 +31683,20 @@ async function renameSymbol(request, services) {
         conflicts.push(`${newName} is already declared in ${id.endsWith("#") ? fileOf(id) : `${fileOf(id)}, class ${id.slice(id.lastIndexOf("#") + 1)}`}`);
       }
     }
+    const heirs = graph.descendants(root);
+    const inUse = [];
+    for (const script of scripts.values()) {
+      for (const occurrence of script.occurrences(newName)) {
+        const body = graph.bodyAt(script.path, occurrence.offset);
+        if (occurrence.kind === "code" && !occurrence.afterDot && heirs.has(body) && graph.declaration(body, newName)?.offset !== occurrence.offset) {
+          inUse.push({ file: script.path, line: script.lines.positionOf(occurrence.offset).line + 1 });
+        }
+      }
+    }
+    if (inUse.length > 0) {
+      const places = inUse.sort((a, b) => a.file.localeCompare(b.file) || a.line - b.line).slice(0, 10).map((place) => `${place.file}:${place.line}`);
+      conflicts.push(`${newName} is already used in code where ${symbol} is inherited, as a local, a parameter or another name the renamed ${what} would shadow or be shadowed by, at ${places.join(", ")}${inUse.length > places.length ? ` and ${inUse.length - places.length} more` : ""}`);
+    }
     if (conflicts.length > 0) {
       return {
         ok: false,
@@ -31670,7 +31717,23 @@ async function renameSymbol(request, services) {
     }
     overrides = family.map((one) => one.file).filter((file) => file !== fileOf(root));
     declaringFiles = family.map((one) => one.file);
-    const resolved = await resolveMember(projectPath, texts, scripts, family, symbol, services);
+    took = { references: { asked: 0, ms: 0 }, definitions: { asked: 0, ms: 0 } };
+    let resolved;
+    try {
+      resolved = await resolveMember(projectPath, texts, scripts, family, symbol, services, took);
+    } catch (error) {
+      if (!(error instanceof LSPTimeout)) {
+        throw error;
+      }
+      return {
+        ok: false,
+        reason: `The editor's language server took the ${error.method} request for ${symbol} and had not answered it after ${String(error.seconds)}s, so nothing was renamed.${error.method === "textDocument/references" ? " Godot answers a references request by looking for the name's text in every script and resolving each match, so a name also written as a common local takes longest." : ""}`,
+        advice: [
+          "script_diagnostics on the declaring script says whether the language server is answering other requests",
+          "The request that ran out is still being answered by the editor, and another sent now waits behind it"
+        ]
+      };
+    }
     if (resolved === null) {
       const first = family[0];
       const script = first === undefined ? undefined : scripts.get(first.file);
@@ -31718,15 +31781,16 @@ async function renameSymbol(request, services) {
     rewrites,
     report: {
       renamed: { what, from: symbol, to: newName, declaredIn: declaringPath, resolvedBy },
+      ...took === null ? {} : { languageServer: took },
       ...overrides.length > 0 ? { overridesRenamed: overrides } : {},
       ...moveTo === null ? {} : { moved: { from: declaringPath, to: moveTo } },
       changed: changedReport(plan.edits, rewrites),
-      leftAlone: plan.mentions,
+      ...leftAloneReport(plan.mentions),
       summary: summaryOf(plan.edits, plan.mentions, rewrites)
     }
   };
 }
-async function resolveMember(projectPath, texts, scripts, family, name, services) {
+async function resolveMember(projectPath, texts, scripts, family, name, services, took) {
   const absoluteOf = new Map(texts.map((file) => [file.path, file.absolute]));
   const key = (place) => `${place.file}:${place.offset}`;
   const toResolved = (located) => {
@@ -31740,11 +31804,16 @@ async function resolveMember(projectPath, texts, scripts, family, name, services
     if (script === undefined || absolute === undefined) {
       return [];
     }
-    const answered = await services[question](absolute, script.text, script.lines.positionOf(place.offset));
-    return answered.map(toResolved).filter((one) => one !== null);
+    const started = performance.now();
+    try {
+      const answered = await services[question](absolute, script.text, script.lines.positionOf(place.offset));
+      return answered.map(toResolved).filter((one) => one !== null);
+    } finally {
+      took[question].asked += 1;
+      took[question].ms += Math.round(performance.now() - started);
+    }
   };
   const ours = new Map;
-  const settled = new Set;
   const root = family[0];
   if (root === undefined) {
     return [];
@@ -31760,23 +31829,13 @@ async function resolveMember(projectPath, texts, scripts, family, name, services
   for (const script of scripts.values()) {
     for (const occurrence of script.occurrences(name)) {
       const place = { file: script.path, offset: occurrence.offset };
-      if (occurrence.kind !== "code" || ours.has(key(place)) || settled.has(key(place))) {
+      if (occurrence.kind !== "code" || ours.has(key(place))) {
         continue;
       }
       const declared = await ask("definitions", place);
       const only = declared.length === 1 ? declared[0] : undefined;
-      if (only === undefined) {
-        settled.add(key(place));
-        continue;
-      }
-      const isOurs = declarations.has(key(only));
-      const same = [place, ...await ask("references", place)];
-      for (const one of same) {
-        if (isOurs) {
-          ours.set(key(one), one);
-        } else {
-          settled.add(key(one));
-        }
+      if (only !== undefined && declarations.has(key(only))) {
+        ours.set(key(place), place);
       }
     }
   }
@@ -31816,6 +31875,28 @@ function changedReport(edits, rewrites) {
     };
   });
 }
+function leftAloneReport(mentions) {
+  const full = [];
+  const prose = new Map;
+  for (const mention of mentions) {
+    if ((mention.kind === "comment" || mention.kind === "text") && mention.why === undefined) {
+      const key = `${mention.file}
+${mention.kind}`;
+      const group = prose.get(key) ?? { file: mention.file, kind: mention.kind, lines: [] };
+      if (!group.lines.includes(mention.line)) {
+        group.lines.push(mention.line);
+      }
+      prose.set(key, group);
+    } else {
+      full.push(mention);
+    }
+  }
+  const loudFirst = (mention) => mention.kind === "string" && mention.why !== undefined ? 0 : 1;
+  return {
+    leftAlone: full.sort((a, b) => loudFirst(a) - loudFirst(b)),
+    ...prose.size > 0 ? { leftAloneInProse: [...prose.values()] } : {}
+  };
+}
 function summaryOf(edits, mentions, rewrites) {
   const count = (values) => {
     const counted = {};
@@ -33002,7 +33083,7 @@ var TOOL_SPECS = [
   },
   {
     name: "script_edit",
-    description: "Creates a GDScript file, or adds functions, variables and signals to one. Every declaration written carries a type. Both load what they wrote under the project's own warning settings and answer with parses; the engine's reasons for a refusal come back under engine_messages. create answers with the extends and class_name the engine read, and a script declaring a class_name is put in the project's class list, with registered saying whether it is there. modify makes every addition or none, and answers with the line each one is on in the file written. rename renames a class or a member wherever the engine uses it and writes every file or none: changed lists each file with its changed lines as they now read, and leftAlone lists every other whole-word occurrence of the old name with what the tokenizer makes of it (code, string, comment, doc, nodePath, scene, text, or ignored for a file under a .gdignore directory, which is never changed) and, where it is not plain, why: a find_children string, a word in a comment, a node named like the class, a call on a value whose type the analyser could not tell. Read leftAlone before calling the rename done; nothing in it was changed. Afterwards an open editor scans the changed files and reloads every changed script, which is also the compile check, and its answer comes back under editor; with no editor the class cache is rebuilt and the changed scripts are compiled in a fresh engine, under classCache and compiled.",
+    description: "Creates a GDScript file, or adds functions, variables and signals to one. Every declaration written carries a type. Both load what they wrote under the project's own warning settings and answer with parses; the engine's reasons for a refusal come back under engine_messages. create answers with the extends and class_name the engine read, and a script declaring a class_name is put in the project's class list, with registered saying whether it is there. modify makes every addition or none, and answers with the line each one is on in the file written. rename renames a class or a member wherever the engine uses it and writes every file or none. A new name already taken is refused with nothing written, a member's included when a class inheriting it already uses the name in code, as a local or a parameter. changed lists each file with its changed lines as they now read, and leftAlone lists every other whole-word occurrence of the old name with what the tokenizer makes of it (code, string, comment, doc, nodePath, scene, text, or ignored for a file under a .gdignore directory, which is never changed) and, where it is not plain, why: a string that is the old name whole, such as find_children's type or a call's method name, which nothing renames or compiles and which is listed first; a node named like the class; a call on a value whose type the analyser could not tell. A member rename answers under languageServer how many requests it made and how long they took. A comment or a line of a text file with nothing more to say is given under leftAloneInProse by file and line instead. Read both before calling the rename done; nothing in them was changed. Afterwards an open editor scans the changed files and reloads every changed script, which is also the compile check, and its answer comes back under editor; with no editor the class cache is rebuilt and the changed scripts are compiled in a fresh engine, under classCache and compiled. written is true once the files are written, and ok is false when what came after the write failed: the files are left changed, and note says so.",
     parameters: {
       projectPath: PROJECT_PATH,
       scriptPath: SCRIPT_PATH,
@@ -38518,7 +38599,9 @@ class GodotServer {
         }
         return await question(client);
       } catch (error) {
-        languageServer.problem = normalizeLSPError(error, client.port);
+        if (!(error instanceof LSPTimeout)) {
+          languageServer.problem = normalizeLSPError(error, client.port);
+        }
         throw error;
       }
     };
@@ -38567,7 +38650,18 @@ class GodotServer {
       rebuildCache: outcome.isClass || outcome.moved !== null,
       moved: outcome.moved !== null
     });
-    return this.jsonTextResponse({ ok: settled.ok, ...outcome.report, ...settled.report });
+    const said = readString(settled.report, "note");
+    const leftChanged = settled.ok ? said : [
+      "The rename was written: every file under changed now reads as shown there and is left that way. ok is false for what came after the write, said under editor or compiled.",
+      ...said === undefined ? [] : [said]
+    ].join(" ");
+    return this.jsonTextResponse({
+      ok: settled.ok,
+      written: true,
+      ...outcome.report,
+      ...settled.report,
+      ...leftChanged === undefined ? {} : { note: leftChanged }
+    });
   }
   async settleRenameInEditor(projectPath, changed, names) {
     const { gone, oldClass, newClass } = names;

package/package.json

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