gdharness 1.1.35 → 1.1.37

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. 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.",
+      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, and code that is certainly another symbol of the same name, a bare name in a file where nothing inherits the member or one the language server resolved to another declaration, under leftAloneOtherSymbols by file, why and line. 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,
@@ -40136,7 +40136,7 @@ function planClassRename(args) {
   return plan.build();
 }
 function planMemberRename(args) {
-  const { texts, scripts, graph, root, family, kind, oldName, newName, resolved } = args;
+  const { texts, scripts, graph, root, family, kind, oldName, newName, resolved, elsewhere, heirFiles } = args;
   const plan = new PlanBuilder(oldName, newName);
   const heirs = graph.descendants(root);
   const docKind = DOC_KIND[kind];
@@ -40193,7 +40193,13 @@ function planMemberRename(args) {
     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";
+    if (!occurrence.afterDot && !heirFiles.has(file)) {
+      return NOT_INHERITED;
+    }
+    if (elsewhere.has(`${file}:${String(occurrence.offset)}`)) {
+      return RESOLVED_ELSEWHERE;
+    }
+    return occurrence.afterDot ? "not resolved to this member by the language server: a value whose type the analyser could not tell, so it may be this member and is left for you" : "not resolved to this member by the language server, which gave no single declaration for it";
   });
   return plan.build();
 }
@@ -40530,7 +40536,7 @@ function applyRewrites(rewrites) {
     throw error;
   }
 }
-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 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", NOT_INHERITED = "no class in this file inherits the member, so a bare name here is that class's own local, parameter or member, or a global", RESOLVED_ELSEWHERE = "the language server resolved this to another declaration of the name";
 var init_rename = __esm(() => {
   init_gdscript_source();
   DOC_LINK_KINDS = new Set([
@@ -40747,9 +40753,10 @@ async function renameSymbol(request, services) {
     overrides = family.map((one) => one.file).filter((file) => file !== fileOf(root));
     declaringFiles = family.map((one) => one.file);
     took = { references: { asked: 0, ms: 0 }, definitions: { asked: 0, ms: 0 } };
+    const heirFiles = new Set([...graph.descendants(root)].map(fileOf));
     let resolved;
     try {
-      resolved = await resolveMember(projectPath, texts, scripts, family, symbol, services, took);
+      resolved = await resolveMember(projectPath, texts, scripts, family, symbol, services, took, heirFiles);
     } catch (error) {
       if (!(error instanceof LSPTimeout)) {
         throw error;
@@ -40785,7 +40792,9 @@ async function renameSymbol(request, services) {
       kind,
       oldName: symbol,
       newName,
-      resolved
+      resolved: resolved.ours,
+      elsewhere: resolved.elsewhere,
+      heirFiles
     });
   }
   if (moveTo !== null) {
@@ -40819,7 +40828,7 @@ async function renameSymbol(request, services) {
     }
   };
 }
-async function resolveMember(projectPath, texts, scripts, family, name, services, took) {
+async function resolveMember(projectPath, texts, scripts, family, name, services, took, heirFiles) {
   const absoluteOf = new Map(texts.map((file) => [file.path, file.absolute]));
   const key = (place) => `${place.file}:${place.offset}`;
   const toResolved = (located) => {
@@ -40843,9 +40852,10 @@ async function resolveMember(projectPath, texts, scripts, family, name, services
     }
   };
   const ours = new Map;
+  const elsewhere = new Set;
   const root = family[0];
   if (root === undefined) {
-    return [];
+    return { ours: [], elsewhere };
   }
   const seeded = await ask("references", root);
   if (seeded.length === 0) {
@@ -40861,14 +40871,19 @@ async function resolveMember(projectPath, texts, scripts, family, name, services
       if (occurrence.kind !== "code" || ours.has(key(place))) {
         continue;
       }
+      if (!occurrence.afterDot && !heirFiles.has(script.path)) {
+        continue;
+      }
       const declared = await ask("definitions", place);
       const only = declared.length === 1 ? declared[0] : undefined;
       if (only !== undefined && declarations.has(key(only))) {
         ours.set(key(place), place);
+      } else if (only !== undefined) {
+        elsewhere.add(key(place));
       }
     }
   }
-  return [...ours.values()];
+  return { ours: [...ours.values()], elsewhere };
 }
 function changedReport(edits, rewrites) {
   return rewrites.map((rewrite) => {
@@ -40907,15 +40922,25 @@ function changedReport(edits, rewrites) {
 function leftAloneReport(mentions) {
   const full = [];
   const prose = new Map;
+  const others = new Map;
+  const add = (group, line) => {
+    if (!group.lines.includes(line)) {
+      group.lines.push(line);
+    }
+  };
   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);
-      }
+      add(group, mention.line);
       prose.set(key, group);
+    } else if (mention.kind === "code" && (mention.why === NOT_INHERITED || mention.why === RESOLVED_ELSEWHERE)) {
+      const key = `${mention.file}
+${mention.why}`;
+      const group = others.get(key) ?? { file: mention.file, why: mention.why, lines: [] };
+      add(group, mention.line);
+      others.set(key, group);
     } else {
       full.push(mention);
     }
@@ -40923,7 +40948,8 @@ ${mention.kind}`;
   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()] } : {}
+    ...prose.size > 0 ? { leftAloneInProse: [...prose.values()] } : {},
+    ...others.size > 0 ? { leftAloneOtherSymbols: [...others.values()] } : {}
   };
 }
 function summaryOf(edits, mentions, rewrites) {
@@ -42378,7 +42404,7 @@ class GodotServer {
     return this.saying(answer, {
       update_available: {
         ...notice,
-        what_to_do: "Tell the user a newer gdharness is out, with what changed, and offer to take it. " + "Only run the upgrade command if they say yes: it replaces the addons in their project, " + "and afterwards the MCP server has to be reconnected and the editor restarted with " + "editor_launch restart."
+        what_to_do: "Tell the user a newer gdharness is out, with what changed. Run the upgrade command " + "only with their agreement: a yes now, or a standing instruction of theirs, such as " + "their CLAUDE.md, to upgrade on every release. Without either, offer it and wait, since " + "it replaces the addons in their project. Afterwards the MCP server has to be " + "reconnected and the editor restarted with editor_launch restart."
       }
     });
   }
@@ -47789,8 +47815,9 @@ To rename a class or a member across the project, use \`script_edit rename\` rat
 replacement: it changes the uses the engine resolves, doc links and what scenes record, and lists
 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\`
+\`.gdignore\` directory there too, a word in a comment or a text file by line under
+\`leftAloneInProse\`, and a local or another class's member of the same name by line under
+\`leftAloneOtherSymbols\`. 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

package/build/index.js

@@ -30861,8 +30861,10 @@ function planClassRename(args) {
   });
   return plan.build();
 }
+var NOT_INHERITED = "no class in this file inherits the member, so a bare name here is that class's own local, parameter or member, or a global";
+var RESOLVED_ELSEWHERE = "the language server resolved this to another declaration of the name";
 function planMemberRename(args) {
-  const { texts, scripts, graph, root, family, kind, oldName, newName, resolved } = args;
+  const { texts, scripts, graph, root, family, kind, oldName, newName, resolved, elsewhere, heirFiles } = args;
   const plan = new PlanBuilder(oldName, newName);
   const heirs = graph.descendants(root);
   const docKind = DOC_KIND[kind];
@@ -30919,7 +30921,13 @@ function planMemberRename(args) {
     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";
+    if (!occurrence.afterDot && !heirFiles.has(file)) {
+      return NOT_INHERITED;
+    }
+    if (elsewhere.has(`${file}:${String(occurrence.offset)}`)) {
+      return RESOLVED_ELSEWHERE;
+    }
+    return occurrence.afterDot ? "not resolved to this member by the language server: a value whose type the analyser could not tell, so it may be this member and is left for you" : "not resolved to this member by the language server, which gave no single declaration for it";
   });
   return plan.build();
 }
@@ -31718,9 +31726,10 @@ async function renameSymbol(request, services) {
     overrides = family.map((one) => one.file).filter((file) => file !== fileOf(root));
     declaringFiles = family.map((one) => one.file);
     took = { references: { asked: 0, ms: 0 }, definitions: { asked: 0, ms: 0 } };
+    const heirFiles = new Set([...graph.descendants(root)].map(fileOf));
     let resolved;
     try {
-      resolved = await resolveMember(projectPath, texts, scripts, family, symbol, services, took);
+      resolved = await resolveMember(projectPath, texts, scripts, family, symbol, services, took, heirFiles);
     } catch (error) {
       if (!(error instanceof LSPTimeout)) {
         throw error;
@@ -31756,7 +31765,9 @@ async function renameSymbol(request, services) {
       kind,
       oldName: symbol,
       newName,
-      resolved
+      resolved: resolved.ours,
+      elsewhere: resolved.elsewhere,
+      heirFiles
     });
   }
   if (moveTo !== null) {
@@ -31790,7 +31801,7 @@ async function renameSymbol(request, services) {
     }
   };
 }
-async function resolveMember(projectPath, texts, scripts, family, name, services, took) {
+async function resolveMember(projectPath, texts, scripts, family, name, services, took, heirFiles) {
   const absoluteOf = new Map(texts.map((file) => [file.path, file.absolute]));
   const key = (place) => `${place.file}:${place.offset}`;
   const toResolved = (located) => {
@@ -31814,9 +31825,10 @@ async function resolveMember(projectPath, texts, scripts, family, name, services
     }
   };
   const ours = new Map;
+  const elsewhere = new Set;
   const root = family[0];
   if (root === undefined) {
-    return [];
+    return { ours: [], elsewhere };
   }
   const seeded = await ask("references", root);
   if (seeded.length === 0) {
@@ -31832,14 +31844,19 @@ async function resolveMember(projectPath, texts, scripts, family, name, services
       if (occurrence.kind !== "code" || ours.has(key(place))) {
         continue;
       }
+      if (!occurrence.afterDot && !heirFiles.has(script.path)) {
+        continue;
+      }
       const declared = await ask("definitions", place);
       const only = declared.length === 1 ? declared[0] : undefined;
       if (only !== undefined && declarations.has(key(only))) {
         ours.set(key(place), place);
+      } else if (only !== undefined) {
+        elsewhere.add(key(place));
       }
     }
   }
-  return [...ours.values()];
+  return { ours: [...ours.values()], elsewhere };
 }
 function changedReport(edits, rewrites) {
   return rewrites.map((rewrite) => {
@@ -31878,15 +31895,25 @@ function changedReport(edits, rewrites) {
 function leftAloneReport(mentions) {
   const full = [];
   const prose = new Map;
+  const others = new Map;
+  const add = (group, line) => {
+    if (!group.lines.includes(line)) {
+      group.lines.push(line);
+    }
+  };
   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);
-      }
+      add(group, mention.line);
       prose.set(key, group);
+    } else if (mention.kind === "code" && (mention.why === NOT_INHERITED || mention.why === RESOLVED_ELSEWHERE)) {
+      const key = `${mention.file}
+${mention.why}`;
+      const group = others.get(key) ?? { file: mention.file, why: mention.why, lines: [] };
+      add(group, mention.line);
+      others.set(key, group);
     } else {
       full.push(mention);
     }
@@ -31894,7 +31921,8 @@ ${mention.kind}`;
   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()] } : {}
+    ...prose.size > 0 ? { leftAloneInProse: [...prose.values()] } : {},
+    ...others.size > 0 ? { leftAloneOtherSymbols: [...others.values()] } : {}
   };
 }
 function summaryOf(edits, mentions, rewrites) {
@@ -33083,7 +33111,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. 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.",
+    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, and code that is certainly another symbol of the same name, a bare name in a file where nothing inherits the member or one the language server resolved to another declaration, under leftAloneOtherSymbols by file, why and line. 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,
@@ -34954,7 +34982,7 @@ class GodotServer {
     return this.saying(answer, {
       update_available: {
         ...notice,
-        what_to_do: "Tell the user a newer gdharness is out, with what changed, and offer to take it. " + "Only run the upgrade command if they say yes: it replaces the addons in their project, " + "and afterwards the MCP server has to be reconnected and the editor restarted with " + "editor_launch restart."
+        what_to_do: "Tell the user a newer gdharness is out, with what changed. Run the upgrade command " + "only with their agreement: a yes now, or a standing instruction of theirs, such as " + "their CLAUDE.md, to upgrade on every release. Without either, offer it and wait, since " + "it replaces the addons in their project. Afterwards the MCP server has to be " + "reconnected and the editor restarted with editor_launch restart."
       }
     });
   }

package/package.json

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