gdharness 0.13.19 → 0.13.21

package/build/cli.js

@@ -7591,6 +7591,15 @@ function unloadedTypes(messages, declared, cached) {
   }
   return found;
 }
+function classesNamedIn(source, known) {
+  const named = new Set;
+  for (const [word] of source.matchAll(/\b[A-Z][A-Za-z0-9_]*\b/g)) {
+    if (known.has(word)) {
+      named.add(word);
+    }
+  }
+  return [...named].sort();
+}
 function contradictedDiagnostics(messages, classes, sourceOf) {
   const read = new Map;
   const found = [];
@@ -7625,6 +7634,10 @@ function staleClassNames(projectPath) {
   const cached = cachedClasses(projectPath);
   return cached === null ? [...declaredClasses(projectPath).keys()] : staleAgainst(cached, projectPath);
 }
+function heldButGone(projectPath, editorHolds) {
+  const declared = declaredClasses(projectPath);
+  return editorHolds.filter((name) => !declared.has(name)).sort();
+}
 function unseenByEditor(projectPath, editorHolds) {
   const held = new Set(editorHolds);
   return [...declaredClasses(projectPath)].filter(([name]) => !held.has(name)).map(([className, path]) => ({ className, path }));
@@ -38101,7 +38114,19 @@ class GodotServer {
     const unloaded = messages.some((message) => unknownTypeIn(message) !== null) ? unloadedTypes(messages, declaredClasses(projectPath), cached) : [];
     const notes = [];
     if (contradicted.length > 0) {
-      notes.push(`The editor is reporting against an older copy of ${contradicted.length === 1 ? "a type" : "some types"} named under contradictedByTheFile. Each member listed is declared in the file the class cache points at, so those diagnostics are wrong however the code is written. Try editor_rescan first: it costs about half a second and cleared this in one of five measured attempts. If it does not, changing anything the named type itself depends on and rescanning again cleared it on the one occasion that has been tried. editor_launch restart is the only remedy that has always worked, and is the one to reach for when the count above is not good enough odds. project_import refresh_classes does not, and answers added: [] while this is happening.`);
+      const dependsOn = new Set;
+      for (const one of contradicted) {
+        const source = cached === null ? null : this.sourceOfClass(projectPath, one.declaredIn);
+        if (source === null || cached === null) {
+          continue;
+        }
+        for (const name of classesNamedIn(source, cached)) {
+          if (name !== one.type) {
+            dependsOn.add(name);
+          }
+        }
+      }
+      notes.push(`The editor is reporting against an older copy of ${contradicted.length === 1 ? "a type" : "some types"} named under contradictedByTheFile. Each member listed is declared in the file the class cache points at, so those diagnostics are wrong however the code is written. Try editor_rescan first: it costs about half a second and cleared this in one of five measured attempts. If it does not, the lever is that a held type is refreshed when something it depends on changes rather than when it changes itself${dependsOn.size === 0 ? ", though the named types depend on no other global class, which leaves only the restart" : `, so change ${[...dependsOn].sort().join(", ")} and rescan again`}. editor_launch restart is the only remedy that has always worked, and is the one to reach for when the count above is not good enough odds. project_import refresh_classes does not, and answers added: [] while this is happening.`);
     }
     const uncached = unloaded.filter((type) => !type.inTheClassCache);
     if (uncached.length > 0) {
@@ -38117,6 +38142,17 @@ class GodotServer {
       ...notes.length === 0 ? {} : { staleAnalysis: notes.join(" ") }
     };
   }
+  sourceOfClass(projectPath, resourcePath) {
+    const contained = resolveWithinProject(projectPath, resourcePath);
+    if (!contained.ok || !existsSync14(contained.absolutePath)) {
+      return null;
+    }
+    try {
+      return readFileSync15(contained.absolutePath, "utf8");
+    } catch {
+      return null;
+    }
+  }
   async handleLSP(toolName, args) {
     const port = this.editorServes("lspPort", "GDHARNESS_LSP_PORT", DEFAULT_LSP_PORT);
     if (this.lspClient !== null && this.lspClient.port !== port) {
@@ -38986,14 +39022,23 @@ class GodotServer {
       return answered;
     }
     const checked = await this.classesTheEditorCannotSee(args);
-    if (checked.unseen.length === 0 && checked.unchecked === undefined) {
+    const stillHeld = checked.stillHeld ?? [];
+    if (checked.unseen.length === 0 && stillHeld.length === 0 && checked.unchecked === undefined) {
       return answered;
     }
+    const notes = [];
+    if (checked.unseen.length > 0) {
+      notes.push("The cache on disk is right now, and the editor holding this project is still not resolving these: rewriting the file does not reach the list it already loaded. editor_rescan does, on its own and with no change to the declaring script; editor_launch restart also does, and costs more.");
+    }
+    if (stillHeld.length > 0) {
+      notes.push(`The editor is still holding ${stillHeld.join(", ")}, which this project no longer declares, and it will write that list back over the cache this call just corrected. The entry returns pointing at a script that is gone, and the next engine to walk get_global_class_list() dies on "File not found". A rescan does not clear this one: it picks up a class that has appeared and does not drop one that has gone. editor_launch restart does.`);
+    }
     return this.jsonTextResponse({
       ...asParams(JSON.parse(first.text)),
       unseenByEditor: checked.unseen.length > 0 ? checked.unseen : undefined,
+      stillHeldByEditor: stillHeld.length > 0 ? stillHeld : undefined,
       classesUnchecked: checked.unchecked,
-      note: checked.unseen.length > 0 ? "The cache on disk is right now, and the editor holding this project is still not resolving these: rewriting the file does not reach the list it already loaded. editor_rescan does, on its own and with no change to the declaring script; editor_launch restart also does, and costs more." : undefined
+      note: notes.length > 0 ? notes.join(" ") : undefined
     });
   }
   async classesTheEditorCannotSee(args) {
@@ -39020,7 +39065,8 @@ class GodotServer {
     if (!Array.isArray(held["classes"])) {
       return { unseen: [], unchecked: "the editor answered without a class list in it" };
     }
-    return { unseen: unseenByEditor(projectPath, held["classes"].map(String)) };
+    const holds = held["classes"].map(String);
+    return { unseen: unseenByEditor(projectPath, holds), stillHeld: heldButGone(projectPath, holds) };
   }
   async handleViaBridge(toolName, args) {
     if (!this.godotBridge.isConnected()) {

package/build/index.js

@@ -24851,6 +24851,15 @@ function unloadedTypes(messages, declared, cached) {
   }
   return found;
 }
+function classesNamedIn(source, known) {
+  const named = new Set;
+  for (const [word] of source.matchAll(/\b[A-Z][A-Za-z0-9_]*\b/g)) {
+    if (known.has(word)) {
+      named.add(word);
+    }
+  }
+  return [...named].sort();
+}
 function contradictedDiagnostics(messages, classes, sourceOf) {
   const read = new Map;
   const found = [];
@@ -24885,6 +24894,10 @@ function staleClassNames(projectPath) {
   const cached = cachedClasses(projectPath);
   return cached === null ? [...declaredClasses(projectPath).keys()] : staleAgainst(cached, projectPath);
 }
+function heldButGone(projectPath, editorHolds) {
+  const declared = declaredClasses(projectPath);
+  return editorHolds.filter((name) => !declared.has(name)).sort();
+}
 function unseenByEditor(projectPath, editorHolds) {
   const held = new Set(editorHolds);
   return [...declaredClasses(projectPath)].filter(([name]) => !held.has(name)).map(([className, path]) => ({ className, path }));
@@ -30853,7 +30866,19 @@ class GodotServer {
     const unloaded = messages.some((message) => unknownTypeIn(message) !== null) ? unloadedTypes(messages, declaredClasses(projectPath), cached) : [];
     const notes = [];
     if (contradicted.length > 0) {
-      notes.push(`The editor is reporting against an older copy of ${contradicted.length === 1 ? "a type" : "some types"} named under contradictedByTheFile. Each member listed is declared in the file the class cache points at, so those diagnostics are wrong however the code is written. Try editor_rescan first: it costs about half a second and cleared this in one of five measured attempts. If it does not, changing anything the named type itself depends on and rescanning again cleared it on the one occasion that has been tried. editor_launch restart is the only remedy that has always worked, and is the one to reach for when the count above is not good enough odds. project_import refresh_classes does not, and answers added: [] while this is happening.`);
+      const dependsOn = new Set;
+      for (const one of contradicted) {
+        const source = cached === null ? null : this.sourceOfClass(projectPath, one.declaredIn);
+        if (source === null || cached === null) {
+          continue;
+        }
+        for (const name of classesNamedIn(source, cached)) {
+          if (name !== one.type) {
+            dependsOn.add(name);
+          }
+        }
+      }
+      notes.push(`The editor is reporting against an older copy of ${contradicted.length === 1 ? "a type" : "some types"} named under contradictedByTheFile. Each member listed is declared in the file the class cache points at, so those diagnostics are wrong however the code is written. Try editor_rescan first: it costs about half a second and cleared this in one of five measured attempts. If it does not, the lever is that a held type is refreshed when something it depends on changes rather than when it changes itself${dependsOn.size === 0 ? ", though the named types depend on no other global class, which leaves only the restart" : `, so change ${[...dependsOn].sort().join(", ")} and rescan again`}. editor_launch restart is the only remedy that has always worked, and is the one to reach for when the count above is not good enough odds. project_import refresh_classes does not, and answers added: [] while this is happening.`);
     }
     const uncached = unloaded.filter((type) => !type.inTheClassCache);
     if (uncached.length > 0) {
@@ -30869,6 +30894,17 @@ class GodotServer {
       ...notes.length === 0 ? {} : { staleAnalysis: notes.join(" ") }
     };
   }
+  sourceOfClass(projectPath, resourcePath) {
+    const contained = resolveWithinProject(projectPath, resourcePath);
+    if (!contained.ok || !existsSync9(contained.absolutePath)) {
+      return null;
+    }
+    try {
+      return readFileSync11(contained.absolutePath, "utf8");
+    } catch {
+      return null;
+    }
+  }
   async handleLSP(toolName, args) {
     const port = this.editorServes("lspPort", "GDHARNESS_LSP_PORT", DEFAULT_LSP_PORT);
     if (this.lspClient !== null && this.lspClient.port !== port) {
@@ -31738,14 +31774,23 @@ class GodotServer {
       return answered;
     }
     const checked = await this.classesTheEditorCannotSee(args);
-    if (checked.unseen.length === 0 && checked.unchecked === undefined) {
+    const stillHeld = checked.stillHeld ?? [];
+    if (checked.unseen.length === 0 && stillHeld.length === 0 && checked.unchecked === undefined) {
       return answered;
     }
+    const notes = [];
+    if (checked.unseen.length > 0) {
+      notes.push("The cache on disk is right now, and the editor holding this project is still not resolving these: rewriting the file does not reach the list it already loaded. editor_rescan does, on its own and with no change to the declaring script; editor_launch restart also does, and costs more.");
+    }
+    if (stillHeld.length > 0) {
+      notes.push(`The editor is still holding ${stillHeld.join(", ")}, which this project no longer declares, and it will write that list back over the cache this call just corrected. The entry returns pointing at a script that is gone, and the next engine to walk get_global_class_list() dies on "File not found". A rescan does not clear this one: it picks up a class that has appeared and does not drop one that has gone. editor_launch restart does.`);
+    }
     return this.jsonTextResponse({
       ...asParams(JSON.parse(first.text)),
       unseenByEditor: checked.unseen.length > 0 ? checked.unseen : undefined,
+      stillHeldByEditor: stillHeld.length > 0 ? stillHeld : undefined,
       classesUnchecked: checked.unchecked,
-      note: checked.unseen.length > 0 ? "The cache on disk is right now, and the editor holding this project is still not resolving these: rewriting the file does not reach the list it already loaded. editor_rescan does, on its own and with no change to the declaring script; editor_launch restart also does, and costs more." : undefined
+      note: notes.length > 0 ? notes.join(" ") : undefined
     });
   }
   async classesTheEditorCannotSee(args) {
@@ -31772,7 +31817,8 @@ class GodotServer {
     if (!Array.isArray(held["classes"])) {
       return { unseen: [], unchecked: "the editor answered without a class list in it" };
     }
-    return { unseen: unseenByEditor(projectPath, held["classes"].map(String)) };
+    const holds = held["classes"].map(String);
+    return { unseen: unseenByEditor(projectPath, holds), stillHeld: heldButGone(projectPath, holds) };
   }
   async handleViaBridge(toolName, args) {
     if (!this.godotBridge.isConnected()) {

package/package.json

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