pi-mega-compact 0.15.3 → 0.15.4

package/extensions/dashboard-server/resolve-snapshot.ts

@@ -2,21 +2,23 @@
  * dashboard-server/resolve-snapshot.ts — dynamic per-repo snapshot resolver.
  *
  * The dashboard server is launched with a single static stateDir, but the
- * active pi session may be running in a different repo. This module queries
- * the repo registry to find the most recently active repo's dashboard.json,
- * so the Overview always shows live data from the repo pi is actually running
- * in.
+ * active pi session may be running in a different repo. This module resolves
+ * which repo's dashboard.json to serve as the "this session" snapshot.
  *
- * The launch stateDir is a candidate like any other (NOT excluded): when
- * `/dashboard` was run in the repo you are still coding in, the launch dir
- * IS the most-recently-active repo and must win. Excluding it would serve a
- * stale other-repo snapshot, surfacing a phantom 0% "this session" gauge
- * plus a duplicate live-session gauge.
- *
- * Resolution order:
- * 1. Most recently seen repo (by last_seen in repo_registry, launch dir
- *    included) whose dashboard.json exists and has a non-null updatedAt
- * 2. The static launch stateDir's dashboard.json (original behavior)
+ * Resolution order (the launch dir is the OWNer of this dashboard):
+ * 1. The launch stateDir's OWN dashboard.json — the pi process that launched
+ *    this dashboard server is the session you are coding in, so its snapshot
+ *    is "this session" by definition. This must win over any other repo
+ *    regardless of last_seen freshness; otherwise a more-recently-active
+ *    OTHER repo steals the "this session" slot and your actual session gets
+ *    demoted to an "other" gauge, producing the exact duplicate-gauge bug
+ *    (this session + pi-<launchrepo> both showing the same active session
+ *    split across two boxes).
+ * 2. Most recently seen OTHER repo (by last_seen in repo_registry) whose
+ *    dashboard.json exists and has a non-null updatedAt — fallback for when
+ *    the launch dir has no live snapshot yet (e.g. dashboard launched before
+ *    any compaction wrote dashboard.json).
+ * 3. The static launch stateDir's dashboard.json (original behavior).
  */
 
 import { existsSync } from "node:fs";
@@ -40,17 +42,12 @@ interface RepoRegistryRow {
 }
 
 /**
- * Find the most recently active repo's stateDir by scanning the repo registry
- * for the repo with the highest last_seen whose dashboard.json exists and has
- * a non-null updatedAt. Returns null if no suitable repo is found.
- *
- * The launch stateDir is NOT excluded: if it is itself the most-recently-active
- * repo (the common case — `/dashboard` was run in the repo you are still
- * coding in), its live dashboard.json must be served. Excluding it would cause
- * a stale *other*-repo snapshot to win, producing a phantom 0% "this session"
- * gauge + a duplicate live-session gauge.
+ * Find the most recently active OTHER repo's stateDir (excluding the launch
+ * dir, which is handled by the caller) by scanning the repo registry for the
+ * repo with the highest last_seen whose dashboard.json exists and has a
+ * non-null updatedAt. Returns null if no suitable repo is found.
  */
-function mostRecentRepoStateDir(_staticStateDir: string): string | null {
+function mostRecentOtherRepoStateDir(launchStateDir: string): string | null {
 	const indexPath = join(getIndexDir(), "index.sqlite");
 	if (!existsSync(indexPath)) return null;
 	let db;
@@ -58,13 +55,14 @@ function mostRecentRepoStateDir(_staticStateDir: string): string | null {
 		const { DatabaseSync } =
 			require("node:sqlite") as typeof import("node:sqlite");
 		db = new DatabaseSync(indexPath, { readOnly: true });
-		const rows = db
+			const rows = db
 			.prepare(
 				`SELECT state_dir, last_seen FROM repo_registry
 				 WHERE state_dir IS NOT NULL AND last_seen IS NOT NULL
+				   AND state_dir != @launch
 				 ORDER BY last_seen DESC`,
 			)
-			.all() as unknown as RepoRegistryRow[];
+			.all({ launch: launchStateDir }) as unknown as RepoRegistryRow[];
 		for (const r of rows) {
 			const dashPath = join(r.state_dir, "dashboard.json");
 			if (!existsSync(dashPath)) continue;
@@ -93,8 +91,20 @@ export function resolveSnapshot(
 	staticSnapshotPath: string,
 	staticStateDir: string,
 ): ResolvedSnapshot {
-	// Try the most recently active repo first.
-	const activeDir = mostRecentRepoStateDir(staticStateDir);
+	// 1. The launch dir's OWN snapshot is "this session" — the pi process that
+	//    launched this dashboard is the session you are coding in. It wins over
+	//    any other repo regardless of last_seen, so a more-recently-active OTHER
+	//    repo can't steal the "this session" slot and demote your actual session
+	//    to a duplicate "other" gauge.
+	if (existsSync(staticSnapshotPath)) {
+		const launchSnap = readSnapshot(staticSnapshotPath);
+		if (launchSnap.updatedAt) {
+			return { snapshot: launchSnap, stateDir: staticStateDir };
+		}
+	}
+	// 2. Fall back to the most recently active OTHER repo (launch dir had no
+	//    live snapshot yet).
+	const activeDir = mostRecentOtherRepoStateDir(staticStateDir);
 	if (activeDir) {
 		const activePath = join(activeDir, "dashboard.json");
 		const snap = readSnapshot(activePath);
@@ -102,7 +112,7 @@ export function resolveSnapshot(
 			return { snapshot: snap, stateDir: activeDir };
 		}
 	}
-	// Fall back to the static launch path.
+	// 3. Last resort: the static launch path (even if stale).
 	return {
 		snapshot: readSnapshot(staticSnapshotPath),
 		stateDir: staticStateDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-mega-compact",
-  "version": "0.15.3",
+  "version": "0.15.4",
   "description": "Layered, local, vector-backed context compressor for pi — supersede/collapse/cluster compaction with deduped inline recall.",
   "type": "module",
   "license": "BSD-3-Clause",