@codemem/server 0.21.2 → 0.22.0-alpha.2

package/dist/routes/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/routes/sync.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,WAAW,EAAiB,MAAM,eAAe,CAAC;AAuBhE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,KAAK,YAAY,GAAG,MAAM,WAAW,CAAC;AACtC,KAAK,iBAAiB,GAAG;IACxB,KAAK,EACF,UAAU,GACV,SAAS,GACT,UAAU,GACV,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,IAAI,CAAC;IACR,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAmXF;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,YAAY,8EAsMxD;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACzB,QAAQ,EAAE,YAAY,EACtB,oBAAoB,CAAC,EAAE,MAAM,iBAAiB,GAAG,IAAI,8EAqfrD"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/routes/sync.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,WAAW,EAAiB,MAAM,eAAe,CAAC;AAyBhE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,KAAK,YAAY,GAAG,MAAM,WAAW,CAAC;AACtC,KAAK,iBAAiB,GAAG;IACxB,KAAK,EACF,UAAU,GACV,SAAS,GACT,UAAU,GACV,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,IAAI,CAAC;IACR,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AA4fF;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,YAAY,8EAwMxD;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACzB,QAAQ,EAAE,YAAY,EACtB,oBAAoB,CAAC,EAAE,MAAM,iBAAiB,GAAG,IAAI,8EAkiBrD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemem/server",
-  "version": "0.21.2",
+  "version": "0.22.0-alpha.2",
   "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.21.2"
+    "@codemem/core": "^0.22.0-alpha.2"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",

package/static/app.js

@@ -366,6 +366,32 @@
 		if (!resp.ok) throw new Error(payload?.error || text || "request failed");
 		return payload;
 	}
+	async function deletePeer(peerDeviceId) {
+		const resp = await fetch(`/api/sync/peers/${encodeURIComponent(peerDeviceId)}`, { method: "DELETE" });
+		const text = await resp.text();
+		const payload = text ? JSON.parse(text) : {};
+		if (!resp.ok) throw new Error(payload?.error || text || "request failed");
+		return payload;
+	}
+	async function acceptDiscoveredPeer(peerDeviceId, fingerprint) {
+		const resp = await fetch("/api/sync/peers/accept-discovered", {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify({
+				peer_device_id: peerDeviceId,
+				fingerprint
+			})
+		});
+		const text = await resp.text();
+		let payload = {};
+		try {
+			payload = text ? JSON.parse(text) : {};
+		} catch {
+			payload = {};
+		}
+		if (!resp.ok) throw new Error(payload?.detail || payload?.error || text || "request failed");
+		return payload;
+	}
 	async function createActor(displayName) {
 		const resp = await fetch("/api/sync/actors", {
 			method: "POST",
@@ -421,11 +447,19 @@
 	}
 	async function triggerSync(address) {
 		const payload = address ? { address } : {};
-		await fetch("/api/sync/run", {
+		const resp = await fetch("/api/sync/run", {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
 			body: JSON.stringify(payload)
 		});
+		const text = await resp.text();
+		let body = {};
+		try {
+			body = text ? JSON.parse(text) : {};
+		} catch {
+			body = {};
+		}
+		if (!resp.ok) throw new Error(body?.error || text || "request failed");
 	}
 	//#endregion
 	//#region src/lib/format.ts
@@ -1774,6 +1808,30 @@
 		teamInvitePanelOpen = v;
 	}
 	var openPeerScopeEditors = /* @__PURE__ */ new Set();
+	var pendingPeerScopeReviewIds = /* @__PURE__ */ new Set();
+	var freshPeerScopeReviewIds = /* @__PURE__ */ new Set();
+	function requestPeerScopeReview(peerDeviceId) {
+		const value = String(peerDeviceId || "").trim();
+		if (!value) return;
+		pendingPeerScopeReviewIds.add(value);
+		freshPeerScopeReviewIds.add(value);
+		openPeerScopeEditors.add(value);
+	}
+	function isPeerScopeReviewPending(peerDeviceId) {
+		const value = String(peerDeviceId || "").trim();
+		return Boolean(value) && pendingPeerScopeReviewIds.has(value);
+	}
+	function clearPeerScopeReview(peerDeviceId) {
+		const value = String(peerDeviceId || "").trim();
+		if (!value) return;
+		pendingPeerScopeReviewIds.delete(value);
+	}
+	function consumePeerScopeReviewRequest(peerDeviceId) {
+		const value = String(peerDeviceId || "").trim();
+		if (!value || !freshPeerScopeReviewIds.has(value)) return false;
+		freshPeerScopeReviewIds.delete(value);
+		return true;
+	}
 	/** Redact the last two octets of IPv4 addresses. */
 	function redactIpOctets(text) {
 		return text.replace(/\b(\d{1,3}\.\d{1,3})\.\d{1,3}\.\d{1,3}\b/g, "$1.#.#");
@@ -2254,6 +2312,9 @@
 		const toggleAdmin = document.getElementById("syncToggleAdmin");
 		const joinPanel = document.getElementById("syncJoinPanel");
 		const joinRequests = document.getElementById("syncJoinRequests");
+		const discoveredPanel = document.getElementById("syncCoordinatorDiscovered");
+		const discoveredMeta = document.getElementById("syncCoordinatorDiscoveredMeta");
+		const discoveredList = document.getElementById("syncCoordinatorDiscoveredList");
 		if (!meta || !setupPanel || !list || !actions) return;
 		hideSkeleton("syncTeamSkeleton");
 		ensureInvitePanelInAdminSection();
@@ -2261,6 +2322,7 @@
 		list.textContent = "";
 		actions.textContent = "";
 		if (joinRequests) joinRequests.textContent = "";
+		if (discoveredList) discoveredList.textContent = "";
 		setInviteOutputVisibility();
 		const coordinator = state.lastSyncCoordinator;
 		const configured = Boolean(coordinator && coordinator.configured);
@@ -2270,6 +2332,7 @@
 			list.hidden = true;
 			actions.hidden = true;
 			if (joinRequests) joinRequests.hidden = true;
+			if (discoveredPanel) discoveredPanel.hidden = true;
 			if (invitePanel) invitePanel.hidden = !adminSetupExpanded;
 			if (toggleAdmin) toggleAdmin.textContent = adminSetupExpanded ? "Hide team setup" : "Set up a new team instead…";
 			return;
@@ -2278,16 +2341,121 @@
 		list.hidden = false;
 		actions.hidden = false;
 		if (joinRequests) joinRequests.hidden = false;
+		if (discoveredPanel) discoveredPanel.hidden = true;
 		const presenceLabel = coordinator.presence_status === "posted" ? "Connected" : coordinator.presence_status === "not_enrolled" ? "Not connected — import an invite or ask your admin to enroll this device" : "Connection error";
 		const statusRow = el("div", "sync-team-summary");
 		const statusLine = el("div", "sync-team-status-row");
 		const statusLabel = el("span", "sync-team-status-label", "Status");
 		const statusBadge = el("span", `pill ${coordinator.presence_status === "posted" ? "pill-success" : coordinator.presence_status === "not_enrolled" ? "pill-warning" : "pill-error"}`, presenceLabel);
-		const metricParts = [`Paired devices: ${Number(coordinator.paired_peer_count || 0)}`, `Discovered: ${Number(coordinator.fresh_peer_count || 0)}`];
+		const metricParts = [`Paired devices: ${Number(coordinator.paired_peer_count || 0)}`, `Fresh discovered: ${Number(coordinator.fresh_peer_count || 0)}`];
 		if (Number(coordinator.stale_peer_count || 0) > 0) metricParts.push(`Inactive: ${Number(coordinator.stale_peer_count || 0)}`);
 		statusLine.append(statusLabel, statusBadge);
 		statusRow.append(statusLine, el("div", "sync-team-metrics", metricParts.join(" · ")));
 		list.appendChild(statusRow);
+		const localPeers = Array.isArray(state.lastSyncPeers) ? state.lastSyncPeers : [];
+		const unhealthyPeers = localPeers.filter((peer) => {
+			const status = peer?.status || {};
+			return Boolean(peer?.has_error) || [
+				"offline",
+				"stale",
+				"degraded"
+			].includes(String(status.peer_state || ""));
+		});
+		if (unhealthyPeers.length) {
+			const row = el("div", "sync-action");
+			const textWrap = el("div", "sync-action-text");
+			textWrap.textContent = `${unhealthyPeers.length} paired device${unhealthyPeers.length === 1 ? "" : "s"} look stale or unhealthy.`;
+			textWrap.appendChild(el("span", "sync-action-command", "Use Remove peer in People or codemem sync peers remove <peer> before re-pairing."));
+			row.appendChild(textWrap);
+			actions.appendChild(row);
+		}
+		const discoveredDevices = Array.isArray(coordinator.discovered_devices) ? coordinator.discovered_devices : [];
+		if (discoveredPanel && discoveredMeta && discoveredList && discoveredDevices.length) {
+			discoveredPanel.hidden = false;
+			discoveredMeta.textContent = "These devices are visible through coordinator discovery only. They are not active sync peers unless you pair them.";
+			discoveredDevices.forEach((device) => {
+				const row = el("div", "actor-row");
+				const details = el("div", "actor-details");
+				const title = el("div", "actor-title");
+				const rowActions = el("div", "actor-actions");
+				const deviceId = String(device.device_id || "").trim();
+				const displayName = String(device.display_name || "").trim() || deviceId || "Discovered device";
+				const fingerprint = String(device.fingerprint || "").trim();
+				const pairedPeer = localPeers.find((peer) => String(peer?.peer_device_id || "") === deviceId);
+				const pairedFingerprint = String(pairedPeer?.fingerprint || "").trim();
+				const hasConflict = Boolean(pairedPeer) && Boolean(fingerprint) && Boolean(pairedFingerprint) && pairedFingerprint !== fingerprint;
+				const canAccept = Boolean(deviceId) && Boolean(fingerprint) && !pairedPeer && !device.stale;
+				title.append(el("strong", null, displayName));
+				title.appendChild(el("span", `badge actor-badge${device.stale ? "" : " local"}`, device.stale ? "Inactive" : "Fresh"));
+				title.appendChild(el("span", "badge actor-badge", hasConflict ? "Conflicts with local peer" : pairedPeer ? "Paired locally" : "Not paired locally"));
+				const addresses = Array.isArray(device.addresses) ? device.addresses : [];
+				const noteParts = [deviceId, addresses.length ? addresses.map((address) => isSyncRedactionEnabled() ? redactAddress(String(address || "")) : String(address || "")).filter(Boolean).join(" · ") : "No fresh addresses"];
+				if (hasConflict) noteParts.push("repair the local peer before accepting this discovered device");
+				else if (pairedPeer && isPeerScopeReviewPending(deviceId)) noteParts.push("scope review pending in People");
+				else if (pairedPeer?.last_error) noteParts.push(`paired error: ${String(pairedPeer.last_error)}`);
+				else if (pairedPeer?.status?.peer_state) noteParts.push(`paired status: ${String(pairedPeer.status.peer_state)}`);
+				details.append(title, el("div", "peer-meta", noteParts.join(" · ")));
+				if (canAccept) {
+					const acceptBtn = el("button", "settings-button", "Accept peer");
+					acceptBtn.addEventListener("click", async () => {
+						acceptBtn.disabled = true;
+						acceptBtn.textContent = "Accepting…";
+						try {
+							await acceptDiscoveredPeer(deviceId, fingerprint);
+							requestPeerScopeReview(deviceId);
+							showGlobalNotice(`Accepted ${displayName}. Its scope editor is now open in People so you can review sync scope next.`);
+							await _loadSyncData$1();
+						} catch (error) {
+							showGlobalNotice(friendlyError(error, "Failed to accept discovered peer."), "warning");
+							acceptBtn.textContent = "Retry accept";
+						} finally {
+							acceptBtn.disabled = false;
+							if (acceptBtn.textContent === "Accepting…") acceptBtn.textContent = "Accept peer";
+						}
+					});
+					rowActions.appendChild(acceptBtn);
+				} else if (!pairedPeer && device.stale) rowActions.appendChild(el("div", "peer-meta", "Wait for a fresh coordinator presence update."));
+				else if (hasConflict) {
+					const inspectBtn = el("button", "settings-button", "Jump to local peer");
+					inspectBtn.addEventListener("click", () => {
+						const peerCard = document.querySelector(`[data-peer-device-id="${CSS.escape(deviceId)}"]`);
+						if (peerCard instanceof HTMLElement) {
+							peerCard.scrollIntoView({
+								block: "center",
+								behavior: "smooth"
+							});
+							showGlobalNotice(`Jumped to the conflicting local peer for ${displayName}.`, "warning");
+							return;
+						}
+						showGlobalNotice("Conflicting local peer is not visible yet. Scroll to the People area and try again.", "warning");
+					});
+					const removeConflictBtn = el("button", "settings-button", "Remove conflicting peer");
+					removeConflictBtn.addEventListener("click", async () => {
+						if (!pairedPeer) return;
+						if (!window.confirm(`Remove the conflicting local peer for ${displayName}? You can accept the discovered device again after this refreshes.`)) return;
+						removeConflictBtn.disabled = true;
+						inspectBtn.disabled = true;
+						removeConflictBtn.textContent = "Removing…";
+						try {
+							await deletePeer(deviceId);
+							showGlobalNotice(`Removed the conflicting local peer for ${displayName}. If it is still fresh, you can now accept it from Team sync.`);
+							await _loadSyncData$1();
+						} catch (error) {
+							showGlobalNotice(friendlyError(error, "Failed to remove the conflicting local peer."), "warning");
+							removeConflictBtn.textContent = "Retry remove";
+						} finally {
+							removeConflictBtn.disabled = false;
+							inspectBtn.disabled = false;
+							if (removeConflictBtn.textContent === "Removing…") removeConflictBtn.textContent = "Remove conflicting peer";
+						}
+					});
+					rowActions.append(inspectBtn, removeConflictBtn);
+				} else if (pairedPeer && isPeerScopeReviewPending(deviceId)) rowActions.appendChild(el("div", "peer-meta", "Review this peer's scope in People next."));
+				else if (pairedPeer) rowActions.appendChild(el("div", "peer-meta", "Manage this peer in People."));
+				row.append(details, rowActions);
+				discoveredList.appendChild(row);
+			});
+		}
 		const inviteToggleRow = el("div", "sync-action");
 		const inviteToggleText = el("div", "sync-action-text");
 		inviteToggleText.textContent = "Generate an invite to add another teammate to this team.";
@@ -2421,6 +2589,7 @@
 				syncInviteOutput.focus();
 				syncInviteOutput.select();
 				showGlobalNotice("Invite created. Copy the text above and share it with your teammate.");
+				(Array.isArray(result.warnings) ? result.warnings : []).forEach((warning) => showGlobalNotice(String(warning), "warning"));
 			} catch (error) {
 				showGlobalNotice(friendlyError(error, "Failed to create invite."), "warning");
 			} finally {
@@ -2587,27 +2756,66 @@
 			const card = el("div", "peer-card");
 			const titleRow = el("div", "peer-title");
 			const peerId = peer.peer_device_id ? String(peer.peer_device_id) : "";
+			if (peerId) card.dataset.peerDeviceId = peerId;
 			const displayName = peer.name || (peerId ? peerId.slice(0, 8) : "unknown");
+			const destructiveLabel = peer.name || peerId || displayName;
+			const pendingScopeReview = isPeerScopeReviewPending(peerId);
 			const name = el("strong", null, displayName);
 			if (peerId) name.title = peerId;
 			const peerStatus = peer.status || {};
 			const online = peerStatus.sync_status === "ok" || peerStatus.ping_status === "ok";
 			const badge = el("span", `badge ${online ? "badge-online" : "badge-offline"}`, online ? "Online" : "Offline");
 			name.append(" ", badge);
+			if (pendingScopeReview) name.append(" ", el("span", "badge actor-badge", "Needs scope review"));
 			const actions = el("div", "peer-actions");
 			const primaryAddress = pickPrimaryAddress(peer.addresses);
 			const syncBtn = el("button", null, "Sync now");
 			syncBtn.disabled = !primaryAddress;
 			syncBtn.addEventListener("click", async () => {
+				if (pendingScopeReview) {
+					if (!window.confirm(`Sync scope review is still pending for ${displayName}. Continue with a manual sync anyway?`)) return;
+				}
 				syncBtn.disabled = true;
 				syncBtn.textContent = "Syncing…";
 				try {
 					await triggerSync(primaryAddress);
-				} catch {}
-				syncBtn.disabled = false;
-				syncBtn.textContent = "Sync now";
+					if (pendingScopeReview) showGlobalNotice(`Triggered sync for ${displayName} before scope review was finished. Review scope in this card if you want tighter sharing rules.`, "warning");
+					else showGlobalNotice(`Started sync with ${displayName}.`);
+				} catch (error) {
+					showGlobalNotice(friendlyError(error, "Failed to trigger sync."), "warning");
+					syncBtn.disabled = false;
+					syncBtn.textContent = "Sync now";
+					return;
+				}
+				try {
+					await _loadSyncData();
+				} catch {
+					showGlobalNotice("Sync started, but the local status view did not refresh yet.", "warning");
+				} finally {
+					syncBtn.disabled = false;
+					syncBtn.textContent = "Sync now";
+				}
 			});
 			actions.appendChild(syncBtn);
+			const removeBtn = el("button", null, "Remove peer");
+			removeBtn.addEventListener("click", async () => {
+				if (!peerId) return;
+				if (!window.confirm(`Remove peer ${destructiveLabel}? This deletes the local sync peer entry.`)) return;
+				removeBtn.disabled = true;
+				removeBtn.textContent = "Removing…";
+				try {
+					await deletePeer(peerId);
+					showGlobalNotice(`Removed peer ${destructiveLabel}.`);
+					await _loadSyncData();
+				} catch (error) {
+					showGlobalNotice(friendlyError(error, "Failed to remove peer."), "warning");
+					removeBtn.textContent = "Retry remove";
+				} finally {
+					removeBtn.disabled = false;
+					if (removeBtn.textContent === "Removing…") removeBtn.textContent = "Remove peer";
+				}
+			});
+			actions.appendChild(removeBtn);
 			const toggleScopeBtn = el("button", null, "Edit scope");
 			actions.appendChild(toggleScopeBtn);
 			const peerAddresses = Array.isArray(peer.addresses) ? Array.from(new Set(peer.addresses.filter(Boolean))) : [];
@@ -2658,6 +2866,7 @@
 			const includeEditor = createChipEditor(includeList, "Add included project", "All projects");
 			const excludeEditor = createChipEditor(excludeList, "Add excluded project", "No exclusions");
 			const scopeEditorOpen = openPeerScopeEditors.has(peerId);
+			const scopeReviewRequested = consumePeerScopeReviewRequest(peerId);
 			const editorWrap = el("div", `peer-scope-editor-wrap${scopeEditorOpen ? "" : " collapsed"}`);
 			if (!scopeEditorOpen) editorWrap.inert = true;
 			const inputRow = el("div", "peer-scope-row");
@@ -2670,6 +2879,7 @@
 				saveScopeBtn.textContent = "Saving…";
 				try {
 					await updatePeerScope(peerId, includeEditor.values(), excludeEditor.values());
+					clearPeerScopeReview(peerId);
 					showGlobalNotice("Device sync scope saved.");
 					await _loadSyncData();
 				} catch (error) {
@@ -2685,6 +2895,7 @@
 				inheritBtn.textContent = "Resetting…";
 				try {
 					await updatePeerScope(peerId, null, null, true);
+					clearPeerScopeReview(peerId);
 					showGlobalNotice("Device sync scope reset to global defaults.");
 					await _loadSyncData();
 				} catch (error) {
@@ -2708,6 +2919,13 @@
 				toggleScopeBtn.setAttribute("aria-expanded", String(isCollapsed));
 				toggleScopeBtn.textContent = isCollapsed ? "Hide scope editor" : "Edit scope";
 			});
+			if (scopeReviewRequested) {
+				scopePanel.prepend(el("div", "peer-meta", "Review this device's sync scope now. Global defaults apply until you save an override here."));
+				queueMicrotask(() => card.scrollIntoView({
+					block: "center",
+					behavior: "smooth"
+				}));
+			} else if (pendingScopeReview) scopePanel.prepend(el("div", "peer-meta", "Scope review still pending. Save an override here or reset to global scope when you are done reviewing. Manual syncs can proceed, but they will use the current effective scope until you change it."));
 			scopePanel.append(identityRow, identityMeta, actorRow, actorHint, scopeSummary, effectiveSummary, editorWrap);
 			titleRow.append(name, actions);
 			card.append(titleRow, addressLabel, meta, scopePanel);

package/static/index.html

@@ -1774,6 +1774,11 @@
         </div>
         <div class="actor-list" id="syncTeamStatus" aria-live="polite"></div>
         <div class="actor-list" id="syncJoinRequests"></div>
+        <div id="syncCoordinatorDiscovered" hidden>
+          <h3 class="settings-group-title" style="margin-top: 20px">Coordinator-discovered devices</h3>
+          <div class="section-meta" id="syncCoordinatorDiscoveredMeta"></div>
+          <div class="actor-list" id="syncCoordinatorDiscoveredList"></div>
+        </div>
         <div class="sync-actions" id="syncTeamActions" hidden></div>
       </div>