gdharness 1.0.4 → 1.0.6

package/build/cli.js

@@ -31601,11 +31601,13 @@ function announcedIn(directory) {
   }
   const strangers = strangersAmong(candidates, Date.now());
   for (const { file, pid, alive } of entries) {
-    const announced = alive && !strangers.has(file) ? parseAnnouncement(file, pid) : { kind: "rubbish" };
+    const gone = !alive || strangers.has(file);
+    const announced = gone ? { kind: "rubbish" } : parseAnnouncement(file, pid);
     if (announced.kind === "rubbish") {
-      if (!alive || strangers.has(file)) {
-        wentAway(file, pid);
+      if (!gone) {
+        continue;
       }
+      wentAway(file, pid);
       try {
         unlinkSync(file);
       } catch {}
@@ -31856,11 +31858,14 @@ function writeBootNote(projectPath, announcedAfterMs) {
     writeFileSync8(path, JSON.stringify({ announcedAfterMs: Math.round(announcedAfterMs), at: new Date().toISOString() }, null, 2), "utf8");
   } catch {}
 }
+function halfAsLongAgain(lastBootMs) {
+  return Math.round(lastBootMs * 1.5);
+}
 function waitSizedTo(lastBootMs, usual = ANNOUNCE_BUDGET_MS) {
   if (lastBootMs === null) {
     return usual;
   }
-  return Math.min(LONGEST_SIZED_WAIT_MS, Math.max(usual, Math.round(lastBootMs * 1.5)));
+  return Math.min(LONGEST_SIZED_WAIT_MS, Math.max(usual, halfAsLongAgain(lastBootMs)));
 }
 var LONGEST_SIZED_WAIT_MS = 60000;
 var init_boot_note = __esm(() => {
@@ -37707,6 +37712,13 @@ function aboutTheChildren(ended, throughEditor) {
   const leftToo = ended.left.length === 0 ? "" : ` ${counted(ended.left.length)} it had started ${ended.left.length === 1 ? "was" : "were"} left, named under childrenLeft: neither announced as a game of this project nor this project's engine run with --path on it, so what ${ended.left.length === 1 ? "it is" : "they are"} cannot be told from here.`;
   return `${endedToo}${leftToo}`;
 }
+function uidsLeftNote(left) {
+  if (left === 0) {
+    return "No scene was written: this reads the project and imports it, and does not resave anything.";
+  }
+  const them = left === 1 ? "it" : "them";
+  return `${left === 1 ? "One file" : `${left} files`} still ${left === 1 ? "has" : "have"} no .uid, named under stillWithoutUid, which is the engine declining to import ${them} rather than this op skipping ${them}. No scene was written.`;
+}
 function endedToStartThis(ended) {
   if (ended === null) {
     return "";
@@ -37734,7 +37746,7 @@ function runtimeVerdict(endpoint, after) {
     };
   }
   const state = after.playingSeen === false ? "the editor has not yet reported the game as playing, which a restarted editor does not until its scan is over" : "the game is still running";
-  const sized = after.sizedToMs === undefined ? "" : `, half as long again as the ${after.sizedToMs}ms its last game took,`;
+  const sized = after.sizedToMs === undefined ? "" : halfAsLongAgain(after.sizedToMs) > after.budgetMs ? `, the longest a start waits unasked though its last game took ${after.sizedToMs}ms to announce,` : `, half as long again as the ${after.sizedToMs}ms its last game took,`;
   return {
     listening: false,
     mayYetAnnounce: after.running,
@@ -37838,7 +37850,10 @@ function aboveTheRunner(entry) {
   const cut = entry.detail.length - runner;
   return {
     ...entry,
-    detail: [...entry.detail.slice(0, runner), `[and ${cut} frames inside ${RUNNER_DIRECTORY}]`]
+    detail: [
+      ...entry.detail.slice(0, runner),
+      `[and ${cut === 1 ? "one frame" : `${cut} frames`} inside ${RUNNER_DIRECTORY}]`
+    ]
   };
 }
 function elsewhereIn(projectPath, asked) {
@@ -38726,7 +38741,7 @@ class GodotServer {
       payload: {
         uidsCreated: given,
         stillWithoutUid: after,
-        note: after.length > 0 ? `${after.length} still have no .uid, which is the engine declining to import them rather than this op skipping them. No scene was written.` : "No scene was written: this reads the project and imports it, and does not resave anything."
+        note: uidsLeftNote(after.length)
       }
     });
   }
@@ -39642,11 +39657,11 @@ class GodotServer {
         return !editorSaysGoing;
       }
     });
-    this.logDebug(`announce wait ended after ${Date.now() - waitBegan}ms: ${endpoint === null ? "nothing announced" : `pid ${endpoint.pid} announced`}, editor asked ${editorAsks} times, last said ${lastSaid()}`);
+    const asked = editorAsks === 0 ? "editor not asked" : `editor asked ${editorAsks === 1 ? "once" : `${editorAsks} times`}, last said ${lastSaid()}`;
+    this.logDebug(`announce wait ended after ${Date.now() - waitBegan}ms: ${endpoint === null ? "nothing announced" : `pid ${endpoint.pid} announced`}, ${asked}`);
     const going = this.currentRun();
     if (endpoint !== null && going !== null && going.announcedPid === undefined) {
-      going.announcedPid = endpoint.pid;
-      this.noteBootOf(going, endpoint);
+      this.tie(going, endpoint);
     }
     return runtimeVerdict(endpoint, {
       addon: true,
@@ -39678,6 +39693,7 @@ class GodotServer {
       return;
     }
     const took = announcedAt - run.startedAt;
+    this.logDebug(`boot of pid ${endpoint.pid} announced ${Math.round(took)}ms after the start of ${run.projectPath}`);
     if (took > 0 && took <= LONGEST_BOOT_NOTED_MS) {
       writeBootNote(run.projectPath, took);
     }
@@ -40002,16 +40018,16 @@ class GodotServer {
       return run.announcedPid;
     }
     const ours = this.announcedOfTheRunsProject(run, announced ?? runtimesAnnounced().running);
-    if (run.pid !== null && ours.some((one) => one.pid === run.pid)) {
-      run.announcedPid = run.pid;
+    const own = ours.find((one) => one.pid === run.pid);
+    if (own !== undefined) {
+      this.tie(run, own);
       return run.announcedPid;
     }
     const before = run.announcedBefore ?? new Set;
     const candidates = ours.filter((one) => !before.has(one.pid) && this.isTheGameOf(run, one, run.projectPath));
     const theOne = candidates.length === 1 ? candidates[0] : undefined;
     if (theOne !== undefined) {
-      run.announcedPid = theOne.pid;
-      this.noteBootOf(run, theOne);
+      this.tie(run, theOne);
     }
     return run.announcedPid;
   }
@@ -40049,7 +40065,7 @@ class GodotServer {
     if (tree === undefined) {
       return;
     }
-    return this.tieThroughTheTree(run, tree, new Set(ours.map((one) => one.pid)));
+    return this.tieThroughTheTree(run, tree, ours);
   }
   async gameProcessOf(run) {
     if (run.gamePid !== undefined) {
@@ -40070,21 +40086,28 @@ class GodotServer {
     }
     return found;
   }
-  tieThroughTheTree(run, tree, games) {
+  tieThroughTheTree(run, tree, announced) {
     const root = run.pid ?? (run.throughEditor ? this.godotBridge.getStatus().editorPid : undefined);
     if (root === undefined) {
       return;
     }
-    if (games.has(root)) {
-      run.announcedPid = root;
-      return root;
+    const games = new Set(announced.map((one) => one.pid));
+    const own = announced.find((one) => one.pid === root);
+    if (own !== undefined) {
+      this.tie(run, own);
+      return own.pid;
     }
-    const nearest = descendantsIn(tree, root).filter((one) => games.has(one) && !gameBetween(tree, one, root, games));
+    const under = new Set(descendantsIn(tree, root));
+    const nearest = announced.filter((one) => under.has(one.pid) && !gameBetween(tree, one.pid, root, games));
     const theOne = nearest.length === 1 ? nearest[0] : undefined;
     if (theOne !== undefined) {
-      run.announcedPid = theOne;
+      this.tie(run, theOne);
     }
-    return theOne;
+    return theOne?.pid;
+  }
+  tie(run, endpoint) {
+    run.announcedPid = endpoint.pid;
+    this.noteBootOf(run, endpoint);
   }
   playedByOurEditor(endpoint, projectPath) {
     const editor = this.godotBridge.getStatus().editorPid;
@@ -40385,7 +40408,7 @@ class GodotServer {
     }
     const announced = this.announcedOfTheRunsProject(run, runtimesAnnounced().running);
     const games = new Set(announced.map((one) => one.pid));
-    const own = this.announcedPidOf(run, announced) ?? this.tieThroughTheTree(run, tree, games) ?? run.gamePid ?? this.gameByCommandLineIn(run, tree);
+    const own = this.announcedPidOf(run, announced) ?? this.tieThroughTheTree(run, tree, announced) ?? run.gamePid ?? this.gameByCommandLineIn(run, tree);
     if (own !== undefined && run.announcedPid === undefined) {
       run.gamePid = own;
     }

package/build/index.js

@@ -25233,11 +25233,13 @@ function announcedIn(directory) {
   }
   const strangers = strangersAmong(candidates, Date.now());
   for (const { file, pid, alive } of entries) {
-    const announced = alive && !strangers.has(file) ? parseAnnouncement(file, pid) : { kind: "rubbish" };
+    const gone = !alive || strangers.has(file);
+    const announced = gone ? { kind: "rubbish" } : parseAnnouncement(file, pid);
     if (announced.kind === "rubbish") {
-      if (!alive || strangers.has(file)) {
-        wentAway(file, pid);
+      if (!gone) {
+        continue;
       }
+      wentAway(file, pid);
       try {
         unlinkSync(file);
       } catch {}
@@ -25482,11 +25484,14 @@ function writeBootNote(projectPath, announcedAfterMs) {
   } catch {}
 }
 var LONGEST_SIZED_WAIT_MS = 60000;
+function halfAsLongAgain(lastBootMs) {
+  return Math.round(lastBootMs * 1.5);
+}
 function waitSizedTo(lastBootMs, usual = ANNOUNCE_BUDGET_MS) {
   if (lastBootMs === null) {
     return usual;
   }
-  return Math.min(LONGEST_SIZED_WAIT_MS, Math.max(usual, Math.round(lastBootMs * 1.5)));
+  return Math.min(LONGEST_SIZED_WAIT_MS, Math.max(usual, halfAsLongAgain(lastBootMs)));
 }
 
 // src/breakpoint-note.ts
@@ -30402,6 +30407,13 @@ function aboutTheChildren(ended, throughEditor) {
   const leftToo = ended.left.length === 0 ? "" : ` ${counted(ended.left.length)} it had started ${ended.left.length === 1 ? "was" : "were"} left, named under childrenLeft: neither announced as a game of this project nor this project's engine run with --path on it, so what ${ended.left.length === 1 ? "it is" : "they are"} cannot be told from here.`;
   return `${endedToo}${leftToo}`;
 }
+function uidsLeftNote(left) {
+  if (left === 0) {
+    return "No scene was written: this reads the project and imports it, and does not resave anything.";
+  }
+  const them = left === 1 ? "it" : "them";
+  return `${left === 1 ? "One file" : `${left} files`} still ${left === 1 ? "has" : "have"} no .uid, named under stillWithoutUid, which is the engine declining to import ${them} rather than this op skipping ${them}. No scene was written.`;
+}
 function endedToStartThis(ended) {
   if (ended === null) {
     return "";
@@ -30430,7 +30442,7 @@ function runtimeVerdict(endpoint, after) {
     };
   }
   const state = after.playingSeen === false ? "the editor has not yet reported the game as playing, which a restarted editor does not until its scan is over" : "the game is still running";
-  const sized = after.sizedToMs === undefined ? "" : `, half as long again as the ${after.sizedToMs}ms its last game took,`;
+  const sized = after.sizedToMs === undefined ? "" : halfAsLongAgain(after.sizedToMs) > after.budgetMs ? `, the longest a start waits unasked though its last game took ${after.sizedToMs}ms to announce,` : `, half as long again as the ${after.sizedToMs}ms its last game took,`;
   return {
     listening: false,
     mayYetAnnounce: after.running,
@@ -30576,7 +30588,10 @@ function aboveTheRunner(entry) {
   const cut = entry.detail.length - runner;
   return {
     ...entry,
-    detail: [...entry.detail.slice(0, runner), `[and ${cut} frames inside ${RUNNER_DIRECTORY}]`]
+    detail: [
+      ...entry.detail.slice(0, runner),
+      `[and ${cut === 1 ? "one frame" : `${cut} frames`} inside ${RUNNER_DIRECTORY}]`
+    ]
   };
 }
 function elsewhereIn(projectPath, asked) {
@@ -31464,7 +31479,7 @@ class GodotServer {
       payload: {
         uidsCreated: given,
         stillWithoutUid: after,
-        note: after.length > 0 ? `${after.length} still have no .uid, which is the engine declining to import them rather than this op skipping them. No scene was written.` : "No scene was written: this reads the project and imports it, and does not resave anything."
+        note: uidsLeftNote(after.length)
       }
     });
   }
@@ -32380,11 +32395,11 @@ class GodotServer {
         return !editorSaysGoing;
       }
     });
-    this.logDebug(`announce wait ended after ${Date.now() - waitBegan}ms: ${endpoint === null ? "nothing announced" : `pid ${endpoint.pid} announced`}, editor asked ${editorAsks} times, last said ${lastSaid()}`);
+    const asked = editorAsks === 0 ? "editor not asked" : `editor asked ${editorAsks === 1 ? "once" : `${editorAsks} times`}, last said ${lastSaid()}`;
+    this.logDebug(`announce wait ended after ${Date.now() - waitBegan}ms: ${endpoint === null ? "nothing announced" : `pid ${endpoint.pid} announced`}, ${asked}`);
     const going = this.currentRun();
     if (endpoint !== null && going !== null && going.announcedPid === undefined) {
-      going.announcedPid = endpoint.pid;
-      this.noteBootOf(going, endpoint);
+      this.tie(going, endpoint);
     }
     return runtimeVerdict(endpoint, {
       addon: true,
@@ -32416,6 +32431,7 @@ class GodotServer {
       return;
     }
     const took = announcedAt - run.startedAt;
+    this.logDebug(`boot of pid ${endpoint.pid} announced ${Math.round(took)}ms after the start of ${run.projectPath}`);
     if (took > 0 && took <= LONGEST_BOOT_NOTED_MS) {
       writeBootNote(run.projectPath, took);
     }
@@ -32740,16 +32756,16 @@ class GodotServer {
       return run.announcedPid;
     }
     const ours = this.announcedOfTheRunsProject(run, announced ?? runtimesAnnounced().running);
-    if (run.pid !== null && ours.some((one) => one.pid === run.pid)) {
-      run.announcedPid = run.pid;
+    const own = ours.find((one) => one.pid === run.pid);
+    if (own !== undefined) {
+      this.tie(run, own);
       return run.announcedPid;
     }
     const before = run.announcedBefore ?? new Set;
     const candidates = ours.filter((one) => !before.has(one.pid) && this.isTheGameOf(run, one, run.projectPath));
     const theOne = candidates.length === 1 ? candidates[0] : undefined;
     if (theOne !== undefined) {
-      run.announcedPid = theOne.pid;
-      this.noteBootOf(run, theOne);
+      this.tie(run, theOne);
     }
     return run.announcedPid;
   }
@@ -32787,7 +32803,7 @@ class GodotServer {
     if (tree === undefined) {
       return;
     }
-    return this.tieThroughTheTree(run, tree, new Set(ours.map((one) => one.pid)));
+    return this.tieThroughTheTree(run, tree, ours);
   }
   async gameProcessOf(run) {
     if (run.gamePid !== undefined) {
@@ -32808,21 +32824,28 @@ class GodotServer {
     }
     return found;
   }
-  tieThroughTheTree(run, tree, games) {
+  tieThroughTheTree(run, tree, announced) {
     const root = run.pid ?? (run.throughEditor ? this.godotBridge.getStatus().editorPid : undefined);
     if (root === undefined) {
       return;
     }
-    if (games.has(root)) {
-      run.announcedPid = root;
-      return root;
+    const games = new Set(announced.map((one) => one.pid));
+    const own = announced.find((one) => one.pid === root);
+    if (own !== undefined) {
+      this.tie(run, own);
+      return own.pid;
     }
-    const nearest = descendantsIn(tree, root).filter((one) => games.has(one) && !gameBetween(tree, one, root, games));
+    const under = new Set(descendantsIn(tree, root));
+    const nearest = announced.filter((one) => under.has(one.pid) && !gameBetween(tree, one.pid, root, games));
     const theOne = nearest.length === 1 ? nearest[0] : undefined;
     if (theOne !== undefined) {
-      run.announcedPid = theOne;
+      this.tie(run, theOne);
     }
-    return theOne;
+    return theOne?.pid;
+  }
+  tie(run, endpoint) {
+    run.announcedPid = endpoint.pid;
+    this.noteBootOf(run, endpoint);
   }
   playedByOurEditor(endpoint, projectPath) {
     const editor = this.godotBridge.getStatus().editorPid;
@@ -33123,7 +33146,7 @@ class GodotServer {
     }
     const announced = this.announcedOfTheRunsProject(run, runtimesAnnounced().running);
     const games = new Set(announced.map((one) => one.pid));
-    const own = this.announcedPidOf(run, announced) ?? this.tieThroughTheTree(run, tree, games) ?? run.gamePid ?? this.gameByCommandLineIn(run, tree);
+    const own = this.announcedPidOf(run, announced) ?? this.tieThroughTheTree(run, tree, announced) ?? run.gamePid ?? this.gameByCommandLineIn(run, tree);
     if (own !== undefined && run.announcedPid === undefined) {
       run.gamePid = own;
     }

package/package.json

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