@codemem/server 0.22.0-alpha.4 → 0.22.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemem/server",
-  "version": "0.22.0-alpha.4",
+  "version": "0.22.0-alpha.5",
   "type": "module",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -18,7 +18,7 @@
     "@hono/node-server": "^1.14.3",
     "drizzle-orm": "^0.45.1",
     "hono": "^4.7.10",
-    "@codemem/core": "^0.22.0-alpha.4"
+    "@codemem/core": "^0.22.0-alpha.5"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",

package/static/app.js

@@ -1871,6 +1871,31 @@
 		});
 		return [...groups.values()].filter((item) => item.actorIds.length > 1).sort((a, b) => a.displayName.localeCompare(b.displayName));
 	}
+	function deriveVisiblePeopleActors(input) {
+		const actors = Array.isArray(input.actors) ? input.actors : [];
+		const peers = Array.isArray(input.peers) ? input.peers : [];
+		const duplicatePeople = Array.isArray(input.duplicatePeople) ? input.duplicatePeople : [];
+		const assignedCounts = /* @__PURE__ */ new Map();
+		peers.forEach((peer) => {
+			const actorId = cleanText(peer?.actor_id);
+			if (!actorId) return;
+			assignedCounts.set(actorId, (assignedCounts.get(actorId) ?? 0) + 1);
+		});
+		const hiddenIds = /* @__PURE__ */ new Set();
+		duplicatePeople.forEach((candidate) => {
+			if (!candidate.includesLocal) return;
+			candidate.actorIds.forEach((actorId) => {
+				const actor = actors.find((item) => cleanText(item?.actor_id) === actorId);
+				if (!actor || actor.is_local) return;
+				if ((assignedCounts.get(actorId) ?? 0) > 0) return;
+				hiddenIds.add(actorId);
+			});
+		});
+		return {
+			visibleActors: actors.filter((actor) => !hiddenIds.has(cleanText(actor?.actor_id))),
+			hiddenLocalDuplicateCount: hiddenIds.size
+		};
+	}
 	function createRepairItem(device) {
 		return {
 			id: `repair:${device.id}`,
@@ -3013,8 +3038,16 @@
 		if (!actorList) return;
 		hideSkeleton("syncActorsSkeleton");
 		actorList.textContent = "";
-		const actors = Array.isArray(state.lastSyncActors) ? state.lastSyncActors : [];
-		if (actorMeta) actorMeta.textContent = actors.length ? "Create, rename, and combine people here. Assign each device below. Non-local people receive memories from allowed projects unless you mark them Only me." : "No named people yet. Create one here, then assign devices below.";
+		const actorVisibility = deriveVisiblePeopleActors({
+			actors: state.lastSyncActors,
+			peers: state.lastSyncPeers,
+			duplicatePeople: state.lastSyncViewModel?.duplicatePeople
+		});
+		const actors = actorVisibility.visibleActors;
+		if (actorMeta) {
+			actorMeta.textContent = actors.length ? "Create, rename, and combine people here. Assign each device below. Non-local people receive memories from allowed projects unless you mark them Only me." : "No named people yet. Create one here, then assign devices below.";
+			if (actorVisibility.hiddenLocalDuplicateCount > 0) actorMeta.textContent += ` ${actorVisibility.hiddenLocalDuplicateCount} unresolved duplicate ${actorVisibility.hiddenLocalDuplicateCount === 1 ? "entry is" : "entries are"} hidden here until reviewed in Needs attention.`;
+		}
 		if (!actors.length) {
 			actorList.appendChild(el("div", "sync-empty-state", "No people yet. Create one to represent yourself or a teammate."));
 			return;
@@ -3027,7 +3060,7 @@
 			const count = assignedActorCount(String(actor.actor_id || ""));
 			const badge = el("span", `badge actor-badge${actor.is_local ? " local" : ""}`, actor.is_local ? "Local" : `${count} device${count === 1 ? "" : "s"}`);
 			title.append(name, badge);
-			const note = el("div", "peer-meta", actor.is_local ? "Used for this device and same-person devices." : `${count} assigned device${count === 1 ? "" : "s"}`);
+			const note = el("div", "peer-meta", actor.is_local ? `Used for this device and same-person devices.${actorVisibility.hiddenLocalDuplicateCount > 0 ? ` ${actorVisibility.hiddenLocalDuplicateCount} unresolved duplicate ${actorVisibility.hiddenLocalDuplicateCount === 1 ? "entry is" : "entries are"} hidden until reviewed in Needs attention.` : ""}` : `${count} assigned device${count === 1 ? "" : "s"}`);
 			details.append(title, note);
 			const actions = el("div", "actor-actions");
 			if (actor.is_local) actions.appendChild(el("div", "peer-meta", "Rename in config"));