@codemem/server 0.22.1 → 0.22.2

package/static/app.js

@@ -148,6 +148,11 @@
 		lastSyncJoinRequests: [],
 		lastTeamInvite: null,
 		lastTeamJoin: null,
+		syncJoinFlowFeedback: null,
+		syncPeerFeedbackById: /* @__PURE__ */ new Map(),
+		syncPeersSectionFeedback: null,
+		syncJoinRequestsFeedback: null,
+		syncDiscoveredFeedback: null,
 		lastSyncAttempts: [],
 		lastSyncLegacyDevices: [],
 		lastSyncViewModel: null,
@@ -235,6 +240,19 @@
 		if (!resp.ok) throw new Error(`${url}: ${resp.status} ${resp.statusText}`);
 		return resp.json();
 	}
+	async function pingViewerReady(timeoutMs = 1200) {
+		const controller = new AbortController();
+		const timeoutId = window.setTimeout(() => controller.abort(), timeoutMs);
+		try {
+			const resp = await fetch("/api/stats", {
+				cache: "no-store",
+				signal: controller.signal
+			});
+			if (!resp.ok) throw new Error(`/api/stats: ${resp.status} ${resp.statusText}`);
+		} finally {
+			window.clearTimeout(timeoutId);
+		}
+	}
 	async function readJsonPayload(resp) {
 		const text = await resp.text();
 		try {
@@ -2511,18 +2529,18 @@
 			priority: 10,
 			title: `${device.name} needs repair`,
 			summary: device.summary,
-			actionLabel: "Review device",
+			actionLabel: "Open device",
 			deviceId: device.id
 		};
 	}
 	function createReviewItem(device) {
 		return {
-			id: `review:${device.id}`,
+			id: `review:${device.id}:${device.key || "default"}`,
 			kind: "review-team-device",
 			priority: 20,
 			title: `${device.name} is available to review`,
 			summary: device.summary,
-			actionLabel: "Review device",
+			actionLabel: "Open device",
 			deviceId: device.id
 		};
 	}
@@ -2533,7 +2551,7 @@
 			priority: 30,
 			title: `Name ${device.name}`,
 			summary: device.summary,
-			actionLabel: "Name device",
+			actionLabel: "Go to name field",
 			deviceId: device.id
 		};
 	}
@@ -2581,7 +2599,7 @@
 				priority: candidate.includesLocal ? 5 : 15,
 				title: `Possible duplicate person: ${candidate.displayName}`,
 				summary: candidate.includesLocal ? "At least one entry is marked as you. Confirm whether these records represent the same person." : "Multiple people share this name. Confirm whether they should stay separate or be combined.",
-				actionLabel: "Review people",
+				actionLabel: "Go to people",
 				actorIds: candidate.actorIds
 			});
 		});
@@ -2617,9 +2635,22 @@
 			}));
 			if (device.peer && trustSummary?.state === "trusted-by-you") attentionItems.push(createReviewItem({
 				id: device.deviceId,
+				key: "other-device-trust",
 				name,
 				summary: "You accepted this device. Finish onboarding on the other device so it trusts this one too."
 			}));
+			if (!device.peer && device.discovered?.stale) attentionItems.push(createReviewItem({
+				id: device.deviceId,
+				key: "stale-discovery",
+				name,
+				summary: "This device is no longer advertising fresh coordinator presence. Wait for it to check in again before connecting it here."
+			}));
+			if (!device.peer && Array.isArray(device.discovered?.groups) && device.discovered.groups.length > 1) attentionItems.push(createReviewItem({
+				id: device.deviceId,
+				key: "ambiguous-groups",
+				name,
+				summary: "This device appears in multiple coordinator groups. Review the team setup before approving it here."
+			}));
 			if (device.peer && deviceNeedsFriendlyName({
 				localName: device.localName,
 				coordinatorName: device.coordinatorName,
@@ -3947,6 +3978,11 @@
 					placeholder: "Invite will appear here",
 					readOnly: true,
 					hidden: true
+				}),
+				/* @__PURE__ */ u("div", {
+					className: "peer-meta",
+					id: "syncInviteWarnings",
+					hidden: true
 				})
 			]
 		});
@@ -4029,6 +4065,12 @@
 	function PairingText({ text }) {
 		return /* @__PURE__ */ u(k$2, { children: text });
 	}
+	function SyncEmptyState({ title, detail }) {
+		return /* @__PURE__ */ u("div", {
+			class: "sync-empty-state",
+			children: [/* @__PURE__ */ u("strong", { children: title }), /* @__PURE__ */ u("span", { children: detail })]
+		});
+	}
 	function renderDiagnosticsGrid(mount, items) {
 		if (!items.length) {
 			clearSyncMount(mount);
@@ -4043,6 +4085,9 @@
 		}
 		renderIntoSyncMount(mount, /* @__PURE__ */ u(AttemptsList, { attempts }));
 	}
+	function renderSyncEmptyState(mount, view) {
+		renderIntoSyncMount(mount, /* @__PURE__ */ u(SyncEmptyState, { ...view }));
+	}
 	function renderPairingView(payloadMount, hintMount, view) {
 		renderIntoSyncMount(payloadMount, /* @__PURE__ */ u(PairingText, { text: view.payloadText }));
 		if (hintMount) renderIntoSyncMount(hintMount, /* @__PURE__ */ u(PairingText, { text: view.hintText }));
@@ -4259,6 +4304,13 @@
 	//#region src/tabs/sync/diagnostics.ts
 	var SYNC_REDACT_MOUNT_ID = "syncRedactMount";
 	var SYNC_REDACT_LABEL_ID = "syncRedactLabel";
+	function newestPeerPing(peers) {
+		const timestamps = Object.values(peers || {}).map((peer) => {
+			if (!peer || typeof peer !== "object") return "";
+			return String(peer.last_ping_at || "").trim();
+		}).filter(Boolean).sort();
+		return timestamps.length ? timestamps[timestamps.length - 1] : null;
+	}
 	var _renderSyncPeers = () => {};
 	function setRenderSyncPeers(fn) {
 		_renderSyncPeers = fn;
@@ -4295,6 +4347,31 @@
 			hintText: "Copy this command and run it on the other device. Use --include/--exclude to control which projects sync."
 		};
 	}
+	function diagnosticsLoadingState() {
+		return {
+			title: "Diagnostics still loading.",
+			detail: "Wait a moment for local sync status. If it stays blank, refresh the page or check whether sync is enabled on this device."
+		};
+	}
+	function diagnosticsUnavailableState() {
+		return {
+			title: "Diagnostics unavailable right now.",
+			detail: "The viewer could not load sync status. Refresh this page, or check that the local codemem sync service is reachable before retrying."
+		};
+	}
+	function noAttemptsState() {
+		const syncStatus = state.lastSyncStatus;
+		return {
+			title: "No recent sync attempts yet.",
+			detail: syncStatus?.daemon_state === "disabled" || syncStatus?.enabled === false ? "Turn on sync in Settings → Device Sync first. Recent attempts will appear here after this device can actually run sync work." : "Trigger a sync pass or pair another device to generate activity here when you need low-level troubleshooting."
+		};
+	}
+	function unavailableAttemptsState() {
+		return {
+			title: "Recent attempts unavailable right now.",
+			detail: "Attempt history could not be loaded because sync diagnostics failed. Refresh the page after local sync status is reachable again."
+		};
+	}
 	function renderSyncStatus() {
 		const syncStatusGrid = document.getElementById("syncStatusGrid");
 		const syncMeta = document.getElementById("syncMeta");
@@ -4303,16 +4380,16 @@
 		hideSkeleton("syncDiagSkeleton");
 		const status = state.lastSyncStatus;
 		if (!status) {
-			clearSyncMount(syncStatusGrid);
+			renderSyncEmptyState(syncStatusGrid, diagnosticsLoadingState());
 			renderActionList(syncActions, []);
-			if (syncMeta) syncMeta.textContent = "Loading sync status…";
+			if (syncMeta) syncMeta.textContent = "Loading advanced sync diagnostics…";
 			return;
 		}
 		const peers = status.peers || {};
 		const pingPayload = status.ping || {};
 		const syncPayload = status.sync || {};
 		const lastSync = status.last_sync_at || status.last_sync_at_utc || null;
-		const lastPing = pingPayload.last_ping_at || status.last_ping_at || null;
+		const lastPing = pingPayload.last_ping_at || status.last_ping_at || newestPeerPing(peers) || null;
 		const syncError = status.last_sync_error || "";
 		const pingError = status.last_ping_error || "";
 		const pending = Number(status.pending || 0);
@@ -4328,8 +4405,8 @@
 		const peerCount = Object.keys(peers).length;
 		const syncNoPeers = !syncDisabled && peerCount === 0;
 		if (syncMeta) {
-			const parts = syncDisabled ? ["State: Disabled", "Sync is optional and currently off"] : syncNoPeers ? ["State: No peers", "Add peers to enable replication"] : [
-				`State: ${daemonStateLabel}`,
+			const parts = syncDisabled ? ["Advanced sync is off on this device", "Turn on sync in Settings → Device Sync when you want pairing payloads, peer status, and recent attempt details here"] : syncNoPeers ? ["Advanced sync is ready but idle", "Use Show pairing to connect another device, then this panel will start showing live peer status and recent attempts"] : [
+				`Advanced state: ${daemonStateLabel}`,
 				`Peers: ${peerCount}`,
 				lastSync ? `Last sync: ${formatAgeShort(secondsSince(lastSync))} ago` : "Last sync: never"
 			];
@@ -4354,7 +4431,7 @@
 			},
 			{
 				label: "Last sync",
-				value: "n/a"
+				value: "Not running"
 			}
 		] : syncNoPeers ? [
 			{
@@ -4363,7 +4440,7 @@
 			},
 			{
 				label: "Mode",
-				value: "Idle"
+				value: "Ready to pair"
 			},
 			{
 				label: "Pending events",
@@ -4371,7 +4448,7 @@
 			},
 			{
 				label: "Last sync",
-				value: "n/a"
+				value: "Waiting for first peer"
 			}
 		] : [
 			{
@@ -4387,7 +4464,7 @@
 				value: lastSync ? `${formatAgeShort(secondsSince(lastSync))} ago` : "never"
 			},
 			{
-				label: "Last ping",
+				label: "Last peer ping",
 				value: lastPing ? `${formatAgeShort(secondsSince(lastPing))} ago` : "never"
 			},
 			{
@@ -4404,7 +4481,7 @@
 			value: `${syncPayload.seconds_since_last}s`
 		});
 		if (!syncDisabled && !syncNoPeers && pingPayload.seconds_since_last) items.push({
-			label: "Since last ping",
+			label: "Since last peer ping",
 			value: `${pingPayload.seconds_since_last}s`
 		});
 		if (!syncDisabled && retentionEnabled && retentionLastError) items.push({
@@ -4419,7 +4496,7 @@
 				command: "codemem sync start"
 			});
 			actions.push({
-				label: "Then run one immediate sync pass.",
+				label: "Run one sync pass now.",
 				command: "codemem sync once"
 			});
 		} else if (daemonState === "needs_attention") actions.push({
@@ -4436,7 +4513,7 @@
 				command: "codemem sync restart && codemem sync once"
 			});
 			actions.push({
-				label: "Then run doctor for root cause.",
+				label: "Run doctor for the root cause.",
 				command: "codemem sync doctor"
 			});
 		} else if (!syncDisabled && !syncNoPeers && pending > 0) actions.push({
@@ -4450,7 +4527,7 @@
 		if (!syncAttempts) return;
 		const attempts = state.lastSyncAttempts;
 		if (!Array.isArray(attempts) || !attempts.length) {
-			clearSyncMount(syncAttempts);
+			renderSyncEmptyState(syncAttempts, noAttemptsState());
 			return;
 		}
 		renderAttemptsList(syncAttempts, attempts.slice(0, 5).map((attempt) => {
@@ -4462,6 +4539,16 @@
 			};
 		}));
 	}
+	function renderSyncDiagnosticsUnavailable() {
+		const syncStatusGrid = document.getElementById("syncStatusGrid");
+		const syncAttempts = document.getElementById("syncAttempts");
+		const syncMeta = document.getElementById("syncMeta");
+		const syncActions = document.getElementById("syncActions");
+		if (syncStatusGrid) renderSyncEmptyState(syncStatusGrid, diagnosticsUnavailableState());
+		if (syncAttempts) renderSyncEmptyState(syncAttempts, unavailableAttemptsState());
+		if (syncMeta) syncMeta.textContent = "Advanced diagnostics are unavailable right now. Refresh the page, or verify the local sync service before retrying.";
+		renderActionList(syncActions, []);
+	}
 	function renderPairingCollapsible() {
 		const mount = document.getElementById("syncPairingDisclosureMount");
 		const contentHost = document.getElementById("syncPairingPanelMount");
@@ -4575,7 +4662,10 @@
 			className: "sync-action",
 			children: [/* @__PURE__ */ u("div", {
 				className: "sync-action-text",
-				children: "Generate an invite to add another teammate to this team."
+				children: ["Add another teammate.", /* @__PURE__ */ u("span", {
+					className: "sync-action-command",
+					children: "Generate an invite when you are ready to bring another device into this team."
+				})]
 			}), /* @__PURE__ */ u("button", {
 				type: "button",
 				className: "settings-button",
@@ -4593,9 +4683,9 @@
 			className: "sync-action",
 			children: [/* @__PURE__ */ u("div", {
 				className: "sync-action-text",
-				children: ["No devices are paired yet.", /* @__PURE__ */ u("span", {
+				children: ["Pair another device.", /* @__PURE__ */ u("span", {
 					className: "sync-action-command",
-					children: "codemem sync pair --payload-only"
+					children: "Use the pairing command in Advanced diagnostics when you are ready to connect one."
 				})]
 			}), /* @__PURE__ */ u("button", {
 				type: "button",
@@ -4607,26 +4697,34 @@
 	}
 	function SyncInviteJoinPanels({ invitePanel, invitePanelOpen, inviteRestoreParent, joinPanel, joinRestoreParent, onToggleInvitePanel, pairedPeerCount, presenceStatus }) {
 		return /* @__PURE__ */ u(k$2, { children: [
-			/* @__PURE__ */ u(InviteToggleRow, {
+			presenceStatus === "not_enrolled" ? /* @__PURE__ */ u(k$2, { children: [
+				joinPanel ? /* @__PURE__ */ u(ExistingElementSlot$1, {
+					element: joinPanel,
+					hidden: false,
+					restoreParent: joinRestoreParent
+				}) : null,
+				/* @__PURE__ */ u("div", {
+					className: "peer-meta",
+					id: "syncJoinFeedback",
+					hidden: true
+				}),
+				/* @__PURE__ */ u("div", {
+					className: "sync-action",
+					children: /* @__PURE__ */ u("div", {
+						className: "sync-action-text",
+						children: ["This device is not on the team yet.", /* @__PURE__ */ u("span", {
+							className: "sync-action-command",
+							children: "Import an invite or ask an admin to enroll it first."
+						})]
+					})
+				})
+			] }) : null,
+			presenceStatus !== "not_enrolled" ? /* @__PURE__ */ u(InviteToggleRow, {
 				invitePanel,
 				invitePanelOpen,
 				inviteRestoreParent,
 				onToggle: onToggleInvitePanel
-			}),
-			presenceStatus === "not_enrolled" ? /* @__PURE__ */ u(k$2, { children: [joinPanel ? /* @__PURE__ */ u(ExistingElementSlot$1, {
-				element: joinPanel,
-				hidden: false,
-				restoreParent: joinRestoreParent
-			}) : null, /* @__PURE__ */ u("div", {
-				className: "sync-action",
-				children: /* @__PURE__ */ u("div", {
-					className: "sync-action-text",
-					children: ["This device is not connected to the team yet.", /* @__PURE__ */ u("span", {
-						className: "sync-action-command",
-						children: "Import a team invite or ask your admin to enroll this device"
-					})]
-				})
-			})] }) : null,
+			}) : null,
 			!pairedPeerCount && presenceStatus === "posted" ? /* @__PURE__ */ u(PairingCopyRow, {}) : null
 		] });
 	}
@@ -4671,7 +4769,30 @@
 		}, `${item.peerName}:${item.actorId}:${item.scopeLabel}`)) });
 	}
 	//#endregion
+	//#region src/tabs/sync/components/sync-inline-feedback.tsx
+	function SyncInlineFeedback({ feedback }) {
+		if (!feedback?.message) return null;
+		return /* @__PURE__ */ u("div", {
+			className: `sync-inline-feedback ${feedback.tone}`,
+			role: feedback.tone === "warning" ? "alert" : "status",
+			"aria-live": feedback.tone === "warning" ? "assertive" : "polite",
+			children: feedback.message
+		});
+	}
+	//#endregion
 	//#region src/tabs/sync/components/team-sync-panel.tsx
+	function SectionHeading({ count, label }) {
+		return /* @__PURE__ */ u("div", {
+			className: "sync-section-heading",
+			children: [/* @__PURE__ */ u("div", {
+				className: "sync-action-text sync-section-label",
+				children: label
+			}), count ? /* @__PURE__ */ u("span", {
+				className: "badge actor-badge sync-section-count",
+				children: count
+			}) : null]
+		});
+	}
 	function AttentionRow({ item, onAction }) {
 		const [busy, setBusy] = d(false);
 		return /* @__PURE__ */ u("div", {
@@ -4700,228 +4821,256 @@
 	}
 	function PendingJoinRequestRow({ request, onApprove, onDeny }) {
 		const [busyAction, setBusyAction] = d(null);
+		const [feedback, setFeedback] = d(null);
 		const [approveLabel, setApproveLabel] = d("Approve");
 		const [denyLabel, setDenyLabel] = d("Deny");
 		return /* @__PURE__ */ u("div", {
 			className: "actor-row",
-			children: [/* @__PURE__ */ u("div", {
-				className: "actor-details",
-				children: [/* @__PURE__ */ u("div", {
-					className: "actor-title",
-					children: request.displayName
-				}), /* @__PURE__ */ u("div", {
-					className: "peer-meta",
-					children: ["request: ", request.requestId]
-				})]
-			}), /* @__PURE__ */ u("div", {
-				className: "actor-actions",
-				children: [/* @__PURE__ */ u("button", {
-					type: "button",
-					className: "settings-button",
-					disabled: busyAction !== null,
-					onClick: async () => {
-						setBusyAction("approve");
-						setApproveLabel("Approving…");
-						try {
-							await onApprove(request);
-							setApproveLabel("Approve");
-						} catch {
-							setApproveLabel("Retry");
-						} finally {
-							setBusyAction(null);
-						}
-					},
-					children: approveLabel
-				}), /* @__PURE__ */ u("button", {
-					type: "button",
-					className: "settings-button",
-					disabled: busyAction !== null,
-					onClick: async () => {
-						setBusyAction("deny");
-						setDenyLabel("Denying…");
-						try {
-							await onDeny(request);
-							setDenyLabel("Deny");
-						} catch {
-							setDenyLabel("Retry deny");
-						} finally {
-							setBusyAction(null);
-						}
-					},
-					children: denyLabel
-				})]
-			})]
-		});
-	}
-	function DiscoveredDeviceRow({ row, onInspectConflict, onRemoveConflict, onReview }) {
-		const [busy, setBusy] = d(null);
-		const [reviewLabel, setReviewLabel] = d(row.actionLabel || "Review device");
-		const [removeLabel, setRemoveLabel] = d("Remove broken device record");
-		return /* @__PURE__ */ u("div", {
-			className: "actor-row",
-			"data-discovered-device-id": row.deviceId,
-			children: [/* @__PURE__ */ u("div", {
-				className: "actor-details",
-				children: [/* @__PURE__ */ u("div", {
-					className: "actor-title",
-					children: [
-						/* @__PURE__ */ u("strong", {
-							title: row.displayTitle || void 0,
-							children: row.displayName
-						}),
-						/* @__PURE__ */ u("span", {
-							className: `badge actor-badge${row.availabilityLabel === "Offline" ? "" : " local"}`,
-							children: row.availabilityLabel
-						}),
-						/* @__PURE__ */ u("span", {
-							className: "badge actor-badge",
-							children: row.connectionLabel
-						}),
-						row.approvalBadgeLabel ? /* @__PURE__ */ u("span", {
-							className: "badge actor-badge",
-							children: row.approvalBadgeLabel
-						}) : null
-					]
-				}), /* @__PURE__ */ u("div", {
-					className: "peer-meta",
-					children: row.note
-				})]
-			}), /* @__PURE__ */ u("div", {
-				className: "actor-actions",
-				children: [
-					row.mode === "accept" ? /* @__PURE__ */ u("button", {
+			children: [
+				/* @__PURE__ */ u("div", {
+					className: "actor-details",
+					children: /* @__PURE__ */ u("div", {
+						className: "actor-title",
+						title: request.requestId || void 0,
+						children: request.displayName
+					})
+				}),
+				/* @__PURE__ */ u("div", {
+					className: "actor-actions",
+					children: [/* @__PURE__ */ u("button", {
 						type: "button",
 						className: "settings-button",
-						disabled: busy !== null,
+						disabled: busyAction !== null,
 						onClick: async () => {
-							setBusy("review");
-							setReviewLabel("Opening…");
+							setBusyAction("approve");
+							setApproveLabel("Approving…");
 							try {
-								await onReview(row);
-								setReviewLabel(row.actionLabel || "Review device");
+								setFeedback(await onApprove(request) || null);
+								setApproveLabel("Approve");
 							} catch {
-								setReviewLabel("Retry review");
+								setApproveLabel("Retry");
 							} finally {
-								setBusy(null);
+								setBusyAction(null);
 							}
 						},
-						children: reviewLabel
-					}) : null,
-					row.mode === "stale" || row.mode === "ambiguous" || row.mode === "scope-pending" ? /* @__PURE__ */ u("div", {
-						className: "peer-meta",
-						children: row.actionMessage
-					}) : null,
-					row.mode === "paired" && row.pairedMessage ? /* @__PURE__ */ u("div", {
-						className: "peer-meta",
-						children: row.pairedMessage
-					}) : null,
-					row.mode === "conflict" ? /* @__PURE__ */ u(k$2, { children: [/* @__PURE__ */ u("button", {
-						type: "button",
-						className: "settings-button",
-						disabled: busy !== null,
-						onClick: () => onInspectConflict(row),
-						children: "Open device details"
+						children: approveLabel
 					}), /* @__PURE__ */ u("button", {
 						type: "button",
 						className: "settings-button",
-						disabled: busy !== null,
+						disabled: busyAction !== null,
 						onClick: async () => {
-							setBusy("remove");
-							setRemoveLabel("Removing…");
+							setBusyAction("deny");
+							setDenyLabel("Denying…");
 							try {
-								await onRemoveConflict(row);
-								setRemoveLabel("Remove broken device record");
+								setFeedback(await onDeny(request) || null);
+								setDenyLabel("Deny");
 							} catch {
-								setRemoveLabel("Retry remove");
+								setDenyLabel("Retry");
 							} finally {
-								setBusy(null);
+								setBusyAction(null);
 							}
 						},
-						children: removeLabel
-					})] }) : null
-				]
-			})]
+						children: denyLabel
+					})]
+				}),
+				/* @__PURE__ */ u(SyncInlineFeedback, { feedback })
+			]
+		});
+	}
+	function DiscoveredDeviceRow({ row, onInspectConflict, onRemoveConflict, onReview }) {
+		const [busy, setBusy] = d(null);
+		const [feedback, setFeedback] = d(null);
+		const [reviewLabel, setReviewLabel] = d(row.actionLabel || "Review device");
+		const [removeLabel, setRemoveLabel] = d("Remove broken device record");
+		return /* @__PURE__ */ u("div", {
+			className: "actor-row",
+			"data-discovered-device-id": row.deviceId,
+			children: [
+				/* @__PURE__ */ u("div", {
+					className: "actor-details",
+					children: [/* @__PURE__ */ u("div", {
+						className: "actor-title",
+						children: [
+							/* @__PURE__ */ u("strong", {
+								title: row.displayTitle || void 0,
+								children: row.displayName
+							}),
+							/* @__PURE__ */ u("span", {
+								className: `badge actor-badge${row.availabilityLabel === "Offline" ? "" : " local"}`,
+								children: row.availabilityLabel
+							}),
+							/* @__PURE__ */ u("span", {
+								className: "badge actor-badge",
+								children: row.connectionLabel
+							}),
+							row.approvalBadgeLabel ? /* @__PURE__ */ u("span", {
+								className: "badge actor-badge",
+								children: row.approvalBadgeLabel
+							}) : null
+						]
+					}), /* @__PURE__ */ u("div", {
+						className: "peer-meta",
+						children: row.note
+					})]
+				}),
+				/* @__PURE__ */ u("div", {
+					className: "actor-actions",
+					children: [
+						row.mode === "accept" ? /* @__PURE__ */ u("button", {
+							type: "button",
+							className: "settings-button",
+							disabled: busy !== null,
+							onClick: async () => {
+								setBusy("review");
+								setReviewLabel("Reviewing…");
+								try {
+									setFeedback(await onReview(row) || null);
+									setReviewLabel(row.actionLabel || "Review device");
+								} catch {
+									setReviewLabel("Retry");
+								} finally {
+									setBusy(null);
+								}
+							},
+							children: reviewLabel
+						}) : null,
+						(row.mode === "stale" || row.mode === "ambiguous" || row.mode === "scope-pending") && row.actionMessage ? /* @__PURE__ */ u("div", {
+							className: "peer-meta",
+							children: row.actionMessage
+						}) : null,
+						row.mode === "paired" && row.pairedMessage ? /* @__PURE__ */ u("div", {
+							className: "peer-meta",
+							children: row.pairedMessage
+						}) : null,
+						row.mode === "conflict" ? /* @__PURE__ */ u(k$2, { children: [/* @__PURE__ */ u("button", {
+							type: "button",
+							className: "settings-button",
+							disabled: busy !== null,
+							onClick: () => onInspectConflict(row),
+							children: "Open device details"
+						}), /* @__PURE__ */ u("button", {
+							type: "button",
+							className: "settings-button",
+							disabled: busy !== null,
+							onClick: async () => {
+								setBusy("remove");
+								setRemoveLabel("Removing…");
+								try {
+									setFeedback(await onRemoveConflict(row) || null);
+									setRemoveLabel("Remove broken device record");
+								} catch {
+									setRemoveLabel("Retry");
+								} finally {
+									setBusy(null);
+								}
+							},
+							children: removeLabel
+						})] }) : null
+					]
+				}),
+				/* @__PURE__ */ u(SyncInlineFeedback, { feedback })
+			]
 		});
 	}
 	function ActionContent(props) {
 		const hasAttentionItems = props.actionItems.length > 0;
+		const hasOtherActionableWork = props.actionableCount > props.actionItems.length;
 		return /* @__PURE__ */ u(k$2, { children: [
-			hasAttentionItems ? /* @__PURE__ */ u("div", {
-				className: "sync-action-text",
-				children: "Needs attention"
-			}) : null,
-			hasAttentionItems ? props.actionItems.slice(0, 4).map((item) => /* @__PURE__ */ u(AttentionRow, {
+			hasAttentionItems || hasOtherActionableWork || props.presenceStatus !== "posted" ? /* @__PURE__ */ u(SectionHeading, { label: "Next steps" }) : null,
+			hasAttentionItems ? props.actionItems.map((item) => /* @__PURE__ */ u(AttentionRow, {
 				item,
 				onAction: props.onAttentionAction
 			}, item.id)) : null,
-			!hasAttentionItems && props.presenceStatus === "posted" ? /* @__PURE__ */ u("div", {
+			!hasAttentionItems && !hasOtherActionableWork && props.presenceStatus === "posted" ? /* @__PURE__ */ u("div", {
 				className: "sync-action",
 				children: /* @__PURE__ */ u("div", {
 					className: "sync-action-text",
-					children: ["No immediate issues", /* @__PURE__ */ u("span", {
-						className: "sync-action-command",
-						children: "Your devices and team records do not currently need review."
-					})]
+					children: "Everything is healthy."
+				})
+			}) : null,
+			!hasAttentionItems && hasOtherActionableWork && props.presenceStatus === "posted" ? /* @__PURE__ */ u("div", {
+				className: "sync-action",
+				children: /* @__PURE__ */ u("div", {
+					className: "sync-action-text",
+					children: "Review the team items below when you are ready."
 				})
 			}) : null,
 			!hasAttentionItems && props.presenceStatus === "not_enrolled" ? /* @__PURE__ */ u("div", {
 				className: "sync-action",
 				children: /* @__PURE__ */ u("div", {
 					className: "sync-action-text",
-					children: ["This device still needs team enrollment", /* @__PURE__ */ u("span", {
+					children: ["This device needs team enrollment", /* @__PURE__ */ u("span", {
 						className: "sync-action-command",
-						children: "Import an invite or ask your admin to enroll this device before expecting sync activity here."
+						children: "Import an invite or ask an admin to enroll it."
 					})]
 				})
-			}) : null,
-			props.children
+			}) : null
 		] });
 	}
+	function TeamActionsContent({ children }) {
+		if (!children) return null;
+		return /* @__PURE__ */ u(k$2, { children: [/* @__PURE__ */ u(SectionHeading, { label: "Keep the team moving" }), children] });
+	}
 	function TeamStatusPortal({ mount, statusSummary }) {
 		return $(/* @__PURE__ */ u("div", {
 			className: "sync-team-summary",
-			children: [/* @__PURE__ */ u("div", {
-				className: "sync-team-status-row",
-				children: [/* @__PURE__ */ u("span", {
-					className: "sync-team-status-label",
-					children: "Status"
-				}), /* @__PURE__ */ u("span", {
-					className: statusSummary.badgeClassName,
-					children: statusSummary.presenceLabel
-				})]
-			}), /* @__PURE__ */ u("div", {
-				className: "sync-team-metrics",
-				children: statusSummary.metricsText
-			})]
+			children: [
+				/* @__PURE__ */ u("div", {
+					className: "sync-team-status-row",
+					children: [/* @__PURE__ */ u("span", {
+						className: "sync-team-status-label",
+						children: "Team status"
+					}), /* @__PURE__ */ u("span", {
+						className: statusSummary.badgeClassName,
+						children: statusSummary.presenceLabel
+					})]
+				}),
+				statusSummary.headline ? /* @__PURE__ */ u("div", {
+					className: "sync-team-headline",
+					children: statusSummary.headline
+				}) : null,
+				/* @__PURE__ */ u("div", {
+					className: "sync-team-metrics sync-team-metrics-secondary",
+					children: statusSummary.metricsText
+				})
+			]
 		}), mount);
 	}
 	function DiscoveredPortal({ mount, rows, onInspectConflict, onRemoveConflict, onReview }) {
-		if (!mount) return null;
-		return $(/* @__PURE__ */ u(k$2, { children: rows.map((row) => /* @__PURE__ */ u(DiscoveredDeviceRow, {
-			row,
-			onInspectConflict,
-			onRemoveConflict,
-			onReview
-		}, row.deviceId)) }), mount);
+		if (!mount || !rows.length && !state.syncDiscoveredFeedback) return null;
+		return $(/* @__PURE__ */ u(k$2, { children: [
+			/* @__PURE__ */ u(SectionHeading, {
+				count: rows.length || void 0,
+				label: "Devices seen on team"
+			}),
+			/* @__PURE__ */ u(SyncInlineFeedback, { feedback: state.syncDiscoveredFeedback }),
+			rows.map((row) => /* @__PURE__ */ u(DiscoveredDeviceRow, {
+				row,
+				onInspectConflict,
+				onRemoveConflict,
+				onReview
+			}, row.deviceId))
+		] }), mount);
 	}
 	function PendingRequestsPortal({ mount, requests, onApprove, onDeny }) {
-		if (!mount || !requests.length) return null;
-		return $(/* @__PURE__ */ u(k$2, { children: [/* @__PURE__ */ u("div", {
-			className: "peer-meta",
-			children: [
-				requests.length,
-				" pending join request",
-				requests.length === 1 ? "" : "s"
-			]
-		}), requests.map((request) => /* @__PURE__ */ u(PendingJoinRequestRow, {
-			request,
-			onApprove,
-			onDeny
-		}, request.requestId))] }), mount);
+		if (!mount || !requests.length && !state.syncJoinRequestsFeedback) return null;
+		return $(/* @__PURE__ */ u(k$2, { children: [
+			/* @__PURE__ */ u(SectionHeading, {
+				count: requests.length || void 0,
+				label: "Pending join requests"
+			}),
+			/* @__PURE__ */ u(SyncInlineFeedback, { feedback: state.syncJoinRequestsFeedback }),
+			requests.map((request) => /* @__PURE__ */ u(PendingJoinRequestRow, {
+				request,
+				onApprove,
+				onDeny
+			}, request.requestId))
+		] }), mount);
 	}
 	function TeamSyncPanel(props) {
 		return /* @__PURE__ */ u(k$2, { children: [
 			/* @__PURE__ */ u(ActionContent, { ...props }),
+			/* @__PURE__ */ u(TeamActionsContent, { children: props.children }),
 			/* @__PURE__ */ u(TeamStatusPortal, {
 				mount: props.listMount,
 				statusSummary: props.statusSummary
@@ -9869,14 +10018,43 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 	}
 	function setInviteOutputVisibility() {
 		const syncInviteOutput = document.getElementById("syncInviteOutput");
+		const syncInviteWarnings = document.getElementById("syncInviteWarnings");
 		if (!syncInviteOutput) return;
 		const encoded = String(state.lastTeamInvite?.encoded || "").trim();
 		syncInviteOutput.value = encoded;
 		syncInviteOutput.hidden = !encoded;
+		if (syncInviteWarnings) {
+			const warnings = Array.isArray(state.lastTeamInvite?.warnings) ? state.lastTeamInvite.warnings : [];
+			syncInviteWarnings.textContent = warnings.join(" · ");
+			syncInviteWarnings.hidden = warnings.length === 0;
+		}
+	}
+	function setJoinFeedbackVisibility() {
+		const syncJoinFeedback = document.getElementById("syncJoinFeedback");
+		if (!syncJoinFeedback) return;
+		const feedback = state.syncJoinFlowFeedback;
+		syncJoinFeedback.textContent = feedback?.message || "";
+		syncJoinFeedback.hidden = !feedback?.message;
+		syncJoinFeedback.setAttribute("role", feedback?.tone === "warning" ? "alert" : "status");
+		syncJoinFeedback.setAttribute("aria-live", feedback?.tone === "warning" ? "assertive" : "polite");
+		syncJoinFeedback.className = `peer-meta${feedback ? ` ${feedback.tone === "warning" ? "sync-inline-feedback warning" : "sync-inline-feedback success"}` : ""}`;
 	}
 	function clearContent(node) {
 		if (node) node.textContent = "";
 	}
+	function pulseAttentionTarget(target) {
+		if (!(target instanceof HTMLElement)) return;
+		target.classList.remove("sync-attention-target");
+		target.offsetWidth;
+		target.classList.add("sync-attention-target");
+		window.setTimeout(() => target.classList.remove("sync-attention-target"), 900);
+	}
+	function prefersReducedMotion() {
+		return typeof window !== "undefined" && window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+	}
+	function syncScrollBehavior() {
+		return prefersReducedMotion() ? "auto" : "smooth";
+	}
 	function renderInvitePolicySelect() {
 		const mount = document.getElementById("syncInvitePolicyMount");
 		if (!mount) return;
@@ -9944,11 +10122,13 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 		const meta = document.getElementById("syncTeamMeta");
 		const setupPanel = document.getElementById("syncSetupPanel");
 		const list = document.getElementById("syncTeamStatus");
+		const listHeading = list?.previousElementSibling;
 		const actions = document.getElementById("syncTeamActions");
 		if (!meta || !setupPanel || !list || !actions) return;
 		renderAdminSetupDisclosure();
 		renderInvitePolicySelect();
 		setInviteOutputVisibility();
+		setJoinFeedbackVisibility();
 		const invitePanel = document.getElementById("syncInvitePanel");
 		const inviteRestoreParent = document.getElementById("syncAdminSection");
 		const joinPanel = document.getElementById("syncJoinPanel");
@@ -9973,10 +10153,13 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 		const focusAttentionTarget = (item) => {
 			if (item.kind === "possible-duplicate-person") {
 				const actorList = document.getElementById("syncActorsList");
-				if (actorList instanceof HTMLElement) actorList.scrollIntoView({
-					block: "center",
-					behavior: "smooth"
-				});
+				if (actorList instanceof HTMLElement) {
+					actorList.scrollIntoView({
+						block: "center",
+						behavior: syncScrollBehavior()
+					});
+					pulseAttentionTarget(actorList);
+				}
 				return;
 			}
 			const deviceId = String(item.deviceId || "").trim();
@@ -9986,10 +10169,11 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 				if (renameInput instanceof HTMLInputElement) {
 					renameInput.scrollIntoView({
 						block: "center",
-						behavior: "smooth"
+						behavior: syncScrollBehavior()
 					});
 					renameInput.focus();
 					renameInput.select();
+					pulseAttentionTarget(renameInput);
 					return;
 				}
 			}
@@ -9997,21 +10181,25 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			if (peerCard instanceof HTMLElement) {
 				peerCard.scrollIntoView({
 					block: "center",
-					behavior: "smooth"
+					behavior: syncScrollBehavior()
 				});
+				pulseAttentionTarget(peerCard);
 				return;
 			}
 			const discoveredRow = document.querySelector(`[data-discovered-device-id="${CSS.escape(deviceId)}"]`);
-			if (discoveredRow instanceof HTMLElement) discoveredRow.scrollIntoView({
-				block: "center",
-				behavior: "smooth"
-			});
+			if (discoveredRow instanceof HTMLElement) {
+				discoveredRow.scrollIntoView({
+					block: "center",
+					behavior: syncScrollBehavior()
+				});
+				pulseAttentionTarget(discoveredRow);
+			}
 		};
 		const reviewDuplicatePeople = async (item) => {
 			const actorIds = Array.isArray(item.actorIds) ? item.actorIds.map((value) => String(value || "").trim()).filter(Boolean) : [];
 			const actors = (Array.isArray(state.lastSyncActors) ? state.lastSyncActors : []).filter((actor) => actorIds.includes(String(actor?.actor_id || "").trim()));
 			if (actors.length < 2) {
-				showGlobalNotice("This possible duplicate no longer has enough people to review.", "warning");
+				showGlobalNotice("This duplicate review is outdated. Refresh the card and review the remaining people entries.", "warning");
 				return;
 			}
 			const result = await openDuplicatePersonDialog({
@@ -10033,7 +10221,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			const primary = actors.find((actor) => String(actor?.actor_id || "") === result.primaryActorId);
 			const secondary = actors.find((actor) => String(actor?.actor_id || "") === result.secondaryActorId);
 			if (!primary?.actor_id || !secondary?.actor_id) {
-				showGlobalNotice("Could not determine which people to combine.", "warning");
+				showGlobalNotice("Could not determine which people to combine. Refresh People & devices and try the review again.", "warning");
 				return;
 			}
 			try {
@@ -10060,7 +10248,8 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			});
 		};
 		const configured = Boolean(coordinator && coordinator.configured);
-		meta.textContent = configured ? `Connected to ${String(coordinator.coordinator_url || "")} · group: ${(coordinator.groups || []).join(", ") || "none"}` : "Start here: join an existing team or create a new one before connecting devices and people.";
+		meta.textContent = configured ? `Team: ${(coordinator.groups || []).join(", ") || "none"}` : "Start by joining an existing team or creating one, then connect people and devices.";
+		meta.title = configured ? String(coordinator.coordinator_url || "").trim() : "";
 		if (!configured) {
 			teardownTeamSyncRender(actions, [
 				list,
@@ -10069,6 +10258,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			]);
 			setupPanel.hidden = false;
 			list.hidden = true;
+			if (listHeading) listHeading.hidden = true;
 			actions.hidden = true;
 			if (joinRequests) joinRequests.hidden = true;
 			if (discoveredPanel) discoveredPanel.hidden = true;
@@ -10076,18 +10266,17 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 		}
 		setupPanel.hidden = true;
 		list.hidden = false;
+		if (listHeading) listHeading.hidden = false;
 		actions.hidden = false;
 		const presenceStatus = String(coordinator.presence_status || "");
-		const presenceLabel = presenceStatus === "posted" ? "Connected" : presenceStatus === "not_enrolled" ? "Not connected — import an invite or ask your admin to enroll this device" : "Connection error";
-		const metricParts = [`Connected devices: ${Number(syncView.summary?.connectedDeviceCount || 0)}`, `Seen on team: ${Number(syncView.summary?.seenOnTeamCount || 0)}`];
-		if (Number(syncView.summary?.offlineTeamDeviceCount || 0) > 0) metricParts.push(`Offline on team: ${Number(syncView.summary?.offlineTeamDeviceCount || 0)}`);
-		const statusSummary = {
-			badgeClassName: `pill ${presenceStatus === "posted" ? "pill-success" : presenceStatus === "not_enrolled" ? "pill-warning" : "pill-error"}`,
-			metricsText: metricParts.join(" · "),
-			presenceLabel
-		};
+		const presenceLabel = presenceStatus === "posted" ? "Connected" : presenceStatus === "not_enrolled" ? "Needs enrollment" : "Connection error";
 		const localPeers = Array.isArray(state.lastSyncPeers) ? state.lastSyncPeers : [];
 		const attentionItems = Array.isArray(syncView.attentionItems) ? syncView.attentionItems : [];
+		const connectedCount = Number(syncView.summary?.connectedDeviceCount || 0);
+		const seenOnTeamCount = Number(syncView.summary?.seenOnTeamCount || 0);
+		const offlineTeamDeviceCount = Number(syncView.summary?.offlineTeamDeviceCount || 0);
+		const metricParts = [`Connected ${connectedCount}`, `Team ${seenOnTeamCount}`];
+		if (offlineTeamDeviceCount > 0) metricParts.push(`Offline ${offlineTeamDeviceCount}`);
 		const discoveredRows = (Array.isArray(coordinator.discovered_devices) ? coordinator.discovered_devices : []).map((device) => {
 			const deviceId = String(device.device_id || "").trim();
 			const displayName = resolveFriendlyDeviceName({
@@ -10107,33 +10296,28 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			const canAccept = Boolean(deviceId) && Boolean(fingerprint) && !pairedPeer && !device.stale && !hasAmbiguousCoordinatorGroup;
 			const addresses = Array.isArray(device.addresses) ? device.addresses : [];
 			const noteParts = [addresses.length ? addresses.map((address) => isSyncRedactionEnabled() ? redactAddress(String(address || "")) : String(address || "")).filter(Boolean).join(" · ") : "No fresh addresses"];
-			if (displayTitle) noteParts.push(`device id: ${deviceId}`);
+			if (!addresses.length && displayTitle) noteParts.push(`device id: ${deviceId}`);
 			let actionMessage = null;
 			let mode = canAccept ? "accept" : "none";
 			let pairedMessage = null;
-			if (hasConflict) {
-				noteParts.push("repair the local peer before accepting this discovered device");
-				mode = "conflict";
-			} else if (hasAmbiguousCoordinatorGroup) {
-				noteParts.push("this device appears in multiple coordinator groups; review team setup before approving it here");
-				actionMessage = "This device is visible through multiple coordinator groups. Fix that team setup first, then approve it here.";
+			if (hasConflict) mode = "conflict";
+			else if (hasAmbiguousCoordinatorGroup) {
+				actionMessage = "This device appears in multiple coordinator groups. Review team setup first or ask an admin to clean up the duplicate enrollment before approving it here.";
 				mode = "ambiguous";
 			} else if (pairedPeer && isPeerScopeReviewPending(deviceId)) {
-				noteParts.push("scope review pending in People");
-				actionMessage = `Review this device's scope in People & devices next.`;
+				actionMessage = `Finish this device's scope review in People & devices before you sync it.`;
 				mode = "scope-pending";
 			} else if (pairedPeer?.last_error) {
-				noteParts.push(`paired error: ${String(pairedPeer.last_error)}`);
+				noteParts.push(`error: ${String(pairedPeer.last_error)}`);
 				mode = "paired";
 			} else if (pairedPeer?.status?.peer_state) {
-				noteParts.push(`paired status: ${String(pairedPeer.status.peer_state)}`);
+				noteParts.push(`status: ${String(pairedPeer.status.peer_state)}`);
 				mode = "paired";
 			} else if (!pairedPeer && device.stale) {
-				actionMessage = "Wait for a fresh coordinator presence update.";
+				actionMessage = "Wait for a fresh coordinator presence update, then review this device again here.";
 				mode = "stale";
 			} else if (pairedPeer) mode = "paired";
-			if (approvalSummary.description) noteParts.push(approvalSummary.description);
-			if (mode === "paired") pairedMessage = approvalSummary.state === "waiting-for-other-device" ? approvalSummary.description || "Waiting on the other device." : String(pairedPeer?.last_error || "").toLowerCase().includes("401") && String(pairedPeer?.last_error || "").toLowerCase().includes("unauthorized") ? "Waiting for the other device to trust this one before sync can work." : "Manage this device in People & devices.";
+			if (mode === "paired") pairedMessage = approvalSummary.state === "waiting-for-other-device" ? approvalSummary.description || "Waiting on the other device." : String(pairedPeer?.last_error || "").toLowerCase().includes("401") && String(pairedPeer?.last_error || "").toLowerCase().includes("unauthorized") ? "Waiting for the other device to trust this one before sync can work." : null;
 			return {
 				actionMessage,
 				actionLabel: approvalSummary.actionLabel || "Review device",
@@ -10153,9 +10337,19 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			displayName: String(request.display_name || request.device_id || "Pending device"),
 			requestId: String(request.request_id || "")
 		}));
-		if (discoveredPanel) discoveredPanel.hidden = discoveredRows.length === 0;
-		if (discoveredMeta) discoveredMeta.textContent = discoveredRows.length ? "These devices are visible through team discovery. Review them before connecting them on this machine." : "";
-		if (joinRequests) joinRequests.hidden = pendingJoinRequests.length === 0;
+		const discoveredActionableCount = discoveredRows.filter((row) => row.mode === "accept" || row.mode === "scope-pending").length;
+		const actionableCount = attentionItems.length + pendingJoinRequests.length + discoveredActionableCount;
+		const teamLabel = (coordinator.groups || []).join(", ") || "none";
+		const statusSummary = {
+			badgeClassName: `pill ${presenceStatus === "posted" ? "pill-success" : presenceStatus === "not_enrolled" ? "pill-warning" : "pill-error"}`,
+			headline: presenceStatus === "posted" ? actionableCount > 0 ? `${actionableCount} item${actionableCount === 1 ? "" : "s"} need attention` : "Everything is healthy" : presenceStatus === "not_enrolled" ? "This device is not enrolled in the team yet" : "Sync needs attention",
+			metricsText: metricParts.join(" · "),
+			presenceLabel
+		};
+		meta.textContent = presenceStatus === "posted" ? actionableCount > 0 ? `Team: ${teamLabel}. Start with the next step below, then scan the current team status.` : `Team: ${teamLabel}. Team status and device details are below.` : presenceStatus === "not_enrolled" ? `Team: ${teamLabel}. Enroll this device first, then return here to review the rest of the team.` : `Team: ${teamLabel}. Fix the current sync issue first, then use the rest of this card to verify the team state.`;
+		if (discoveredPanel) discoveredPanel.hidden = discoveredRows.length === 0 && !state.syncDiscoveredFeedback;
+		if (discoveredMeta) discoveredMeta.textContent = discoveredRows.length ? "Review anything here that still needs trust, repair, or approval." : "";
+		if (joinRequests) joinRequests.hidden = pendingJoinRequests.length === 0 && !state.syncJoinRequestsFeedback;
 		teardownTeamSyncRender(actions, [
 			list,
 			joinRequests,
@@ -10166,6 +10360,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 		actions.appendChild(actionMount);
 		renderIntoSyncMount(actionMount, _$1(TeamSyncPanel, {
 			actionItems: attentionItems,
+			actionableCount,
 			children: _$1(SyncInviteJoinPanels, {
 				invitePanel,
 				invitePanelOpen: teamInvitePanelOpen,
@@ -10187,11 +10382,18 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			onApproveJoinRequest: async (request) => {
 				try {
 					await reviewJoinRequest(request.requestId, "approve");
-					showGlobalNotice(`Approved ${request.displayName}. They can now sync with the team.`);
+					const feedback = {
+						message: `Approved ${request.displayName}. They can now sync with the team.`,
+						tone: "success"
+					};
+					state.syncJoinRequestsFeedback = feedback;
 					await _loadSyncData$1();
+					return feedback;
 				} catch (error) {
-					showGlobalNotice(friendlyError(error, "Failed to approve join request."), "warning");
-					throw error;
+					return {
+						message: friendlyError(error, "Failed to approve join request. Keep it pending and try again after the coordinator refreshes."),
+						tone: "warning"
+					};
 				}
 			},
 			onAttentionAction: async (item) => {
@@ -10208,14 +10410,21 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 					confirmLabel: "Deny request",
 					cancelLabel: "Keep request pending",
 					tone: "danger"
-				})) return;
+				})) return null;
 				try {
 					await reviewJoinRequest(request.requestId, "deny");
-					showGlobalNotice(`Denied join request from ${request.displayName}.`);
+					const feedback = {
+						message: `Denied join request from ${request.displayName}.`,
+						tone: "success"
+					};
+					state.syncJoinRequestsFeedback = feedback;
 					await _loadSyncData$1();
+					return feedback;
 				} catch (error) {
-					showGlobalNotice(friendlyError(error, "Failed to deny join request."), "warning");
-					throw error;
+					return {
+						message: friendlyError(error, "Failed to deny join request. Leave it pending for now, then retry after the coordinator refreshes."),
+						tone: "warning"
+					};
 				}
 			},
 			onInspectConflict: (row) => {
@@ -10223,7 +10432,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 				if (peerCard instanceof HTMLElement) {
 					peerCard.scrollIntoView({
 						block: "center",
-						behavior: "smooth"
+						behavior: syncScrollBehavior()
 					});
 					showGlobalNotice(`Opened the conflicting local device record for ${row.displayName}.`, "warning");
 					return;
@@ -10237,20 +10446,27 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 					confirmLabel: "Remove device record",
 					cancelLabel: "Keep device record",
 					tone: "danger"
-				})) return;
+				})) return null;
 				try {
 					await deletePeer(row.deviceId);
-					showGlobalNotice(`Removed the broken local device record for ${row.displayName}. If it is still available, you can review it again from Needs attention.`);
+					const feedback = {
+						message: `Removed the broken local device record for ${row.displayName}. If it is still available, review it again from Next steps or Devices seen on team.`,
+						tone: "success"
+					};
+					state.syncDiscoveredFeedback = feedback;
 					await _loadSyncData$1();
+					return feedback;
 				} catch (error) {
-					showGlobalNotice(friendlyError(error, "Failed to remove the broken local device record."), "warning");
-					throw error;
+					return {
+						message: friendlyError(error, "Failed to remove the broken local device record. The old local record is still present in People & devices."),
+						tone: "warning"
+					};
 				}
 			},
 			onReviewDiscoveredDevice: async (row) => {
 				try {
 					const reviewedName = await reviewDiscoveredDeviceName(row.displayName);
-					if (!reviewedName) return;
+					if (!reviewedName) return null;
 					const result = await acceptDiscoveredPeer(row.deviceId, row.fingerprint);
 					const optimisticName = String(result?.name || row.displayName || "").trim() || row.displayName;
 					state.pendingAcceptedSyncPeers = [...Array.isArray(state.pendingAcceptedSyncPeers) ? state.pendingAcceptedSyncPeers.filter((peer) => String(peer?.peer_device_id || "").trim() !== row.deviceId) : [], {
@@ -10263,23 +10479,44 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 						last_error: "Waiting for the other device to approve this one."
 					}];
 					requestPeerScopeReview(row.deviceId);
-					showGlobalNotice(row.approvalBadgeLabel === "Needs your approval" ? `Approved ${row.displayName} on this device. Two-way trust should be ready once both devices refresh.` : `Step 1 complete on this device for ${row.displayName}. Finish onboarding on the other device so both sides trust each other for sync.`);
+					let feedback = {
+						message: row.approvalBadgeLabel === "Needs your approval" ? `Approved ${row.displayName} on this device. Two-way trust should be ready once both devices refresh.` : `Step 1 complete on this device for ${row.displayName}. Finish onboarding on the other device so both sides trust each other for sync.`,
+						tone: "success"
+					};
 					try {
 						if (reviewedName.trim() !== optimisticName.trim()) {
 							await renamePeer(row.deviceId, reviewedName.trim());
-							showGlobalNotice(`Saved device name: ${reviewedName.trim()}.`);
+							state.pendingAcceptedSyncPeers = state.pendingAcceptedSyncPeers.map((peer) => String(peer?.peer_device_id || "").trim() === row.deviceId ? {
+								...peer,
+								name: reviewedName.trim()
+							} : peer);
+							feedback = {
+								message: `Connected ${reviewedName.trim()} and saved its name.`,
+								tone: "success"
+							};
 						}
 					} catch (error) {
-						showGlobalNotice(friendlyError(error, "Device connected, but naming did not finish."), "warning");
+						feedback = {
+							message: friendlyError(error, "Device connected, but naming did not finish."),
+							tone: "warning"
+						};
 					}
+					state.syncDiscoveredFeedback = feedback;
 					try {
 						await _loadSyncData$1();
 					} catch (error) {
-						showGlobalNotice(friendlyError(error, "Device connected, but the screen did not refresh yet."), "warning");
+						feedback = {
+							message: friendlyError(error, "Device connected, but the screen did not refresh yet. Refresh this page before trying the next step."),
+							tone: "warning"
+						};
+						state.syncDiscoveredFeedback = feedback;
 					}
+					return feedback;
 				} catch (error) {
-					showGlobalNotice(friendlyError(error, "Failed to review this device."), "warning");
-					throw error;
+					return {
+						message: friendlyError(error, "Failed to review this device. Wait for a fresh presence update and try again."),
+						tone: "warning"
+					};
 				}
 			},
 			pendingJoinRequests,
@@ -10316,17 +10553,23 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 					ttl_hours: ttlValue || 24
 				});
 				state.lastTeamInvite = result;
+				setInviteOutputVisibility();
 				syncInviteOutput.value = String(result.encoded || "");
 				syncInviteOutput.hidden = false;
 				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"));
+				const warnings = Array.isArray(result.warnings) ? result.warnings : [];
+				showGlobalNotice(warnings.length ? `Invite created. Copy it above and review ${warnings.length === 1 ? "1 warning" : `${warnings.length} warnings`}.` : "Invite created. Copy the text above and share it with your teammate.", warnings.length ? "warning" : "success");
 			} catch (error) {
-				showGlobalNotice(friendlyError(error, "Failed to create invite."), "warning");
-			} finally {
+				showGlobalNotice(friendlyError(error, "Failed to create invite. Check the team name, invite lifetime, and coordinator reachability, then try again."), "warning");
+				syncCreateInviteButton.textContent = "Retry";
 				syncCreateInviteButton.disabled = false;
-				syncCreateInviteButton.textContent = "Create invite";
+				return;
+			} finally {
+				if (syncCreateInviteButton.disabled) {
+					syncCreateInviteButton.disabled = false;
+					syncCreateInviteButton.textContent = "Create invite";
+				}
 			}
 		});
 		syncJoinButton?.addEventListener("click", async () => {
@@ -10342,14 +10585,37 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			try {
 				const result = await importCoordinatorInvite(inviteValue);
 				state.lastTeamJoin = result;
-				showGlobalNotice(result.status === "pending" ? "Join request submitted — waiting for admin approval." : "Joined team successfully.");
+				let feedback = {
+					message: result.status === "pending" ? "Join request sent. Waiting for admin approval." : "Joined the team.",
+					tone: "success"
+				};
+				state.syncJoinFlowFeedback = feedback;
+				setJoinFeedbackVisibility();
 				syncJoinInvite.value = "";
-				await loadSyncData();
+				try {
+					await loadSyncData();
+				} catch (error) {
+					feedback = {
+						message: friendlyError(error, "Joined the team, but this view has not refreshed yet."),
+						tone: "warning"
+					};
+					state.syncJoinFlowFeedback = feedback;
+					setJoinFeedbackVisibility();
+				}
 			} catch (error) {
-				showGlobalNotice(friendlyError(error, "Failed to import invite."), "warning");
-			} finally {
+				state.syncJoinFlowFeedback = {
+					message: friendlyError(error, "Failed to import invite. Check that the invite is complete, current, and meant for this team, then try again."),
+					tone: "warning"
+				};
+				setJoinFeedbackVisibility();
+				syncJoinButton.textContent = "Retry";
 				syncJoinButton.disabled = false;
-				syncJoinButton.textContent = "Join team";
+				return;
+			} finally {
+				if (syncJoinButton.disabled) {
+					syncJoinButton.disabled = false;
+					syncJoinButton.textContent = "Join team";
+				}
 			}
 		});
 		syncNowButton?.addEventListener("click", async () => {
@@ -10360,7 +10626,10 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 				const summary = summarizeSyncRunResult(await triggerSync());
 				showGlobalNotice(summary.message, summary.warning ? "warning" : void 0);
 			} catch (error) {
-				showGlobalNotice(friendlyError(error, "Failed to start sync."), "warning");
+				showGlobalNotice(friendlyError(error, "Failed to start sync. Retry once, then run codemem sync doctor if the problem keeps coming back."), "warning");
+				syncNowButton.textContent = "Retry";
+				syncNowButton.disabled = false;
+				return;
 			}
 			syncNowButton.disabled = false;
 			syncNowButton.textContent = "Sync now";
@@ -10448,12 +10717,17 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 					className: "actor-title",
 					children: [/* @__PURE__ */ u("strong", { children: actorDisplayLabel(actor) }), /* @__PURE__ */ u("span", {
 						className: `badge actor-badge${actor.is_local ? " local" : ""}`,
+						title: actor.is_local ? localActorNote(hiddenLocalDuplicateCount) : void 0,
 						children: actor.is_local ? "You" : `${count} device${count === 1 ? "" : "s"}`
 					})]
-				}), /* @__PURE__ */ u("div", {
+				}), !actor.is_local ? /* @__PURE__ */ u("div", {
 					className: "peer-meta",
-					children: actor.is_local ? localActorNote(hiddenLocalDuplicateCount) : `${count} assigned device${count === 1 ? "" : "s"}`
-				})]
+					children: [
+						count,
+						" assigned device",
+						count === 1 ? "" : "s"
+					]
+				}) : null]
 			}), /* @__PURE__ */ u("div", {
 				className: "actor-actions",
 				children: actor.is_local ? /* @__PURE__ */ u("div", {
@@ -10509,7 +10783,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 	function SyncActorsList({ actors, hiddenLocalDuplicateCount, onRename, onMerge }) {
 		if (!actors.length) return /* @__PURE__ */ u("div", {
 			className: "sync-empty-state",
-			children: "No people yet. Create one to represent yourself or a teammate."
+			children: [/* @__PURE__ */ u("strong", { children: "No people yet." }), /* @__PURE__ */ u("span", { children: "Create a named person here, then assign each device below to keep sync ownership readable." })]
 		});
 		return /* @__PURE__ */ u(k$2, { children: actors.map((actor) => {
 			const actorId = String(actor.actor_id || actor.display_name || actor.is_local || "");
@@ -10595,6 +10869,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 		const cardRef = A$1(null);
 		const [scopeHost, setScopeHost] = d(null);
 		const [renameValue, setRenameValue] = d(displayName);
+		const [feedback, setFeedback] = d(() => state.syncPeerFeedbackById.get(peerId) ?? null);
 		const [renameBusy, setRenameBusy] = d(false);
 		const [renameLabel, setRenameLabel] = d("Save name");
 		const [syncBusy, setSyncBusy] = d(false);
@@ -10627,6 +10902,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 		const excludeEditor = T$1(() => createChipEditor(excludeList, "Add excluded project", "No exclusions"), [peerId, excludeList.join("|")]);
 		y(() => {
 			setRenameValue(displayName);
+			setFeedback(state.syncPeerFeedbackById.get(peerId) ?? null);
 			setRenameBusy(false);
 			setRenameLabel("Save name");
 			setSyncBusy(false);
@@ -10650,28 +10926,33 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			if (!scopeReviewRequested || !cardRef.current) return;
 			queueMicrotask(() => cardRef.current?.scrollIntoView({
 				block: "center",
-				behavior: "smooth"
+				behavior: window.matchMedia("(prefers-reduced-motion: reduce)").matches ? "auto" : "smooth"
 			}));
 		}, [scopeReviewRequested]);
 		async function rename() {
 			if (!peerId) return;
 			const nextName = renameValue.trim();
 			if (!nextName) {
-				showGlobalNotice("Enter a friendly name for this device.", "warning");
+				const warning = {
+					message: "Enter a friendly name for this device.",
+					tone: "warning"
+				};
+				setFeedback(warning);
+				state.syncPeerFeedbackById.set(peerId, warning);
 				document.querySelector(`[data-device-name-input="${CSS.escape(peerId)}"]`)?.focus();
 				return;
 			}
 			setRenameBusy(true);
 			setRenameLabel("Saving…");
-			let ok = false;
 			try {
-				await onRename(peerId, nextName);
-				ok = true;
+				const nextFeedback = await onRename(peerId, nextName);
+				setFeedback(nextFeedback);
+				state.syncPeerFeedbackById.set(peerId, nextFeedback);
+				setRenameLabel("Save name");
 			} catch {
-				setRenameLabel("Retry save");
+				setRenameLabel("Retry");
 			} finally {
 				setRenameBusy(false);
-				if (ok) setRenameLabel("Save name");
 			}
 		}
 		async function sync() {
@@ -10686,7 +10967,9 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			}
 			setSyncBusy(true);
 			try {
-				await onSync(peer, primaryAddress);
+				const nextFeedback = await onSync(peer, primaryAddress);
+				setFeedback(nextFeedback);
+				if (nextFeedback) state.syncPeerFeedbackById.set(peerId, nextFeedback);
 			} finally {
 				setSyncBusy(false);
 			}
@@ -10716,46 +10999,46 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 		async function savePerson() {
 			if (!peerId) return;
 			setApplyActorBusy(true);
-			setApplyActorLabel("Applying…");
-			let ok = false;
+			setApplyActorLabel("Saving…");
 			try {
-				await onAssignActor(peerId, selectedActorId || null);
-				ok = true;
+				const nextFeedback = await onAssignActor(peerId, selectedActorId || null);
+				setFeedback(nextFeedback);
+				state.syncPeerFeedbackById.set(peerId, nextFeedback);
+				setApplyActorLabel("Save person");
 			} catch {
 				setApplyActorLabel("Retry");
 			} finally {
 				setApplyActorBusy(false);
-				if (ok) setApplyActorLabel("Save person");
 			}
 		}
 		async function saveScope() {
 			if (!peerId) return;
 			setSaveScopeBusy(true);
 			setSaveScopeLabel("Saving…");
-			let ok = false;
 			try {
-				await onSaveScope(peerId, includeEditor.values(), excludeEditor.values());
-				ok = true;
+				const nextFeedback = await onSaveScope(peerId, includeEditor.values(), excludeEditor.values());
+				setFeedback(nextFeedback);
+				state.syncPeerFeedbackById.set(peerId, nextFeedback);
+				setSaveScopeLabel("Save scope");
 			} catch {
-				setSaveScopeLabel("Retry save");
+				setSaveScopeLabel("Retry");
 			} finally {
 				setSaveScopeBusy(false);
-				if (ok) setSaveScopeLabel("Save scope");
 			}
 		}
 		async function resetScope() {
 			if (!peerId) return;
 			setResetScopeBusy(true);
 			setResetScopeLabel("Resetting…");
-			let ok = false;
 			try {
-				await onResetScope(peerId);
-				ok = true;
+				const nextFeedback = await onResetScope(peerId);
+				setFeedback(nextFeedback);
+				state.syncPeerFeedbackById.set(peerId, nextFeedback);
+				setResetScopeLabel("Reset to global scope");
 			} catch {
-				setResetScopeLabel("Retry reset");
+				setResetScopeLabel("Retry");
 			} finally {
 				setResetScopeBusy(false);
-				if (ok) setResetScopeLabel("Reset to global scope");
 			}
 		}
 		return /* @__PURE__ */ u("div", {
@@ -10849,10 +11132,10 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 					children: [
 						scopeReviewRequested ? /* @__PURE__ */ u("div", {
 							className: "peer-meta",
-							children: "Review this device's sync scope now. Global defaults apply until you save an override here."
+							children: "Review this device's sharing scope now."
 						}) : pendingScopeReview ? /* @__PURE__ */ u("div", {
 							className: "peer-meta",
-							children: "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."
+							children: "Scope review still pending."
 						}) : null,
 						/* @__PURE__ */ u("div", {
 							className: "peer-scope-summary",
@@ -10862,10 +11145,6 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 							className: "peer-meta",
 							children: peer.actor_display_name ? `Assigned to ${peer.claimed_local_actor ? "You" : String(peer.actor_display_name)}` : "Unassigned person"
 						}),
-						/* @__PURE__ */ u("div", {
-							className: "peer-meta",
-							children: trustSummary.description
-						}),
 						/* @__PURE__ */ u("div", {
 							className: "peer-actor-row",
 							children: [/* @__PURE__ */ u("div", {
@@ -10889,6 +11168,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 								children: applyActorLabel
 							})]
 						}),
+						/* @__PURE__ */ u(SyncInlineFeedback, { feedback }),
 						/* @__PURE__ */ u("div", { ref: setScopeHost })
 					]
 				})
@@ -10896,17 +11176,20 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 		});
 	}
 	function SyncPeersList(props) {
-		if (!props.peers.length) return /* @__PURE__ */ u("div", {
+		const sectionFeedback = state.syncPeersSectionFeedback;
+		const syncStatus = state.lastSyncStatus;
+		const syncDisabled = syncStatus?.daemon_state === "disabled" || syncStatus?.enabled === false;
+		if (!props.peers.length) return /* @__PURE__ */ u(k$2, { children: [/* @__PURE__ */ u(SyncInlineFeedback, { feedback: sectionFeedback }), /* @__PURE__ */ u("div", {
 			className: "sync-empty-state",
-			children: "No devices connected on this machine yet. Use the pairing command in Diagnostics to connect another device."
-		});
-		return /* @__PURE__ */ u(k$2, { children: props.peers.map((peer) => {
+			children: [/* @__PURE__ */ u("strong", { children: "No paired devices yet." }), /* @__PURE__ */ u("span", { children: syncDisabled ? "Turn on sync in Settings → Device Sync first, then use Show pairing in Advanced diagnostics to connect another device." : "Use the Show pairing control in Advanced diagnostics, run the command on the other device, then come back here to name and assign it." })]
+		})] });
+		return /* @__PURE__ */ u(k$2, { children: [/* @__PURE__ */ u(SyncInlineFeedback, { feedback: sectionFeedback }), props.peers.map((peer) => {
 			const peerId = String(peer.peer_device_id || peer.name || "unknown-peer");
 			return /* @__PURE__ */ u(SyncPeerCard, {
 				peer,
 				...props
 			}, peerId);
-		}) });
+		})] });
 	}
 	function renderSyncPeersList(mount, props) {
 		renderIntoSyncMount(mount, /* @__PURE__ */ u(SyncPeersList, { ...props }));
@@ -10962,6 +11245,12 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 	//#region src/tabs/sync/people.ts
 	var _loadSyncData = async () => {};
 	var legacyDeviceValue = "";
+	function setPeopleCreateControlsDisabled(disabled) {
+		const createButton = document.getElementById("syncActorCreateButton");
+		const createInput = document.getElementById("syncActorCreateInput");
+		if (createButton) createButton.disabled = disabled;
+		if (createInput) createInput.disabled = disabled;
+	}
 	function setLoadSyncData(fn) {
 		_loadSyncData = fn;
 	}
@@ -10970,6 +11259,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 		const actorMeta = document.getElementById("syncActorsMeta");
 		if (!actorList) return;
 		hideSkeleton("syncActorsSkeleton");
+		setPeopleCreateControlsDisabled(false);
 		const actorVisibility = deriveVisiblePeopleActors({
 			actors: state.lastSyncActors,
 			peers: state.lastSyncPeers,
@@ -10977,7 +11267,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 		});
 		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.";
+			actorMeta.textContent = actors.length ? "Manage people here, then assign devices below." : "No named people yet. Create a person here, then assign devices below so sync ownership is easier to review.";
 			if (actorVisibility.hiddenLocalDuplicateCount > 0) actorMeta.textContent += ` ${actorVisibility.hiddenLocalDuplicateCount} unresolved duplicate ${actorVisibility.hiddenLocalDuplicateCount === 1 ? "entry is" : "entries are"} hidden here until reviewed in Needs attention.`;
 		}
 		renderSyncActorsList(actorList, {
@@ -10999,6 +11289,16 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			}
 		});
 	}
+	function renderSyncActorsUnavailable() {
+		const actorList = document.getElementById("syncActorsList");
+		const actorMeta = document.getElementById("syncActorsMeta");
+		setPeopleCreateControlsDisabled(true);
+		if (actorMeta) actorMeta.textContent = "People controls are temporarily unavailable. Refresh this page to retry, but device status and sync health are still available below.";
+		if (actorList) renderSyncEmptyState(actorList, {
+			title: "People unavailable right now.",
+			detail: "Refresh this page to reload named people once the people endpoint is responding again."
+		});
+	}
 	function renderSyncPeers() {
 		const syncPeers = document.getElementById("syncPeers");
 		if (!syncPeers) return;
@@ -11009,75 +11309,133 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			onRename: async (peerId, nextName) => {
 				try {
 					await renamePeer(peerId, nextName);
-					showGlobalNotice("Device name saved.");
 					await _loadSyncData();
+					return {
+						message: "Device name saved.",
+						tone: "success"
+					};
 				} catch (error) {
-					showGlobalNotice(friendlyError(error, "Failed to save device name."), "warning");
-					throw error;
+					return {
+						message: friendlyError(error, "Failed to save device name."),
+						tone: "warning"
+					};
 				}
 			},
 			onSync: async (peer, address) => {
 				try {
 					const summary = summarizeSyncRunResult(await triggerSync(address));
 					const peerId = String(peer?.peer_device_id || "");
-					if (!summary.ok) showGlobalNotice(summary.message, "warning");
-					else if (peerId && isPeerScopeReviewPending(peerId)) showGlobalNotice(`Triggered sync for ${peer?.name || (peerId ? peerId.slice(0, 8) : "unknown")} before scope review was finished. Review scope in this card if you want tighter sharing rules.`, "warning");
-					else showGlobalNotice(summary.message);
+					let feedback;
+					if (!summary.ok) feedback = {
+						message: summary.message,
+						tone: "warning"
+					};
+					else if (peerId && isPeerScopeReviewPending(peerId)) feedback = {
+						message: `Triggered sync for ${peer?.name || (peerId ? peerId.slice(0, 8) : "unknown")}. Review scope in this card if you want tighter sharing rules.`,
+						tone: "warning"
+					};
+					else feedback = {
+						message: summary.message,
+						tone: "success"
+					};
+					try {
+						await _loadSyncData();
+					} catch {
+						feedback = {
+							message: "Sync started, but this view has not refreshed yet. Refresh the page or use Sync now again before retrying.",
+							tone: "warning"
+						};
+					}
+					return feedback;
 				} catch (error) {
-					showGlobalNotice(friendlyError(error, "Failed to trigger sync."), "warning");
-					throw error;
-				}
-				try {
-					await _loadSyncData();
-				} catch {
-					showGlobalNotice("Sync started, but the local status view did not refresh yet.", "warning");
+					return {
+						message: friendlyError(error, "Failed to trigger sync."),
+						tone: "warning"
+					};
 				}
-				return null;
 			},
 			onRemove: async (peerId, label) => {
 				try {
 					await deletePeer(peerId);
-					showGlobalNotice(`Removed peer ${label}.`);
+					const feedback = {
+						message: `Removed peer ${label}.`,
+						tone: "success"
+					};
+					state.syncPeerFeedbackById.delete(peerId);
+					state.syncPeersSectionFeedback = feedback;
 					await _loadSyncData();
+					return feedback;
 				} catch (error) {
-					showGlobalNotice(friendlyError(error, "Failed to remove peer."), "warning");
-					throw error;
+					return {
+						message: friendlyError(error, "Failed to remove peer. The local peer entry is still here."),
+						tone: "warning"
+					};
 				}
 			},
 			onAssignActor: async (peerId, actorId) => {
 				try {
 					await assignPeerActor(peerId, actorId);
-					showGlobalNotice(actorId ? "Device person updated." : "Device person cleared.");
 					await _loadSyncData();
+					return {
+						message: actorId ? "Device person updated." : "Device person cleared.",
+						tone: "success"
+					};
 				} catch (error) {
-					showGlobalNotice(friendlyError(error, "Failed to update device person."), "warning");
-					throw error;
+					return {
+						message: friendlyError(error, "Failed to update device person. The current assignment is unchanged."),
+						tone: "warning"
+					};
 				}
 			},
 			onSaveScope: async (peerId, include, exclude) => {
 				try {
 					await updatePeerScope(peerId, include, exclude);
 					clearPeerScopeReview(peerId);
-					showGlobalNotice("Device sync scope saved.");
 					await _loadSyncData();
+					return {
+						message: "Device sync scope saved.",
+						tone: "success"
+					};
 				} catch (error) {
-					showGlobalNotice(friendlyError(error, "Failed to save device scope."), "warning");
-					throw error;
+					return {
+						message: friendlyError(error, "Failed to save device scope. The current sharing rules are still active."),
+						tone: "warning"
+					};
 				}
 			},
 			onResetScope: async (peerId) => {
 				try {
 					await updatePeerScope(peerId, null, null, true);
 					clearPeerScopeReview(peerId);
-					showGlobalNotice("Device sync scope reset to global defaults.");
 					await _loadSyncData();
+					return {
+						message: "Device sync scope reset to global defaults.",
+						tone: "success"
+					};
 				} catch (error) {
-					showGlobalNotice(friendlyError(error, "Failed to reset device scope."), "warning");
-					throw error;
+					return {
+						message: friendlyError(error, "Failed to reset device scope. The current sharing rules are still active."),
+						tone: "warning"
+					};
 				}
 			}
 		});
 	}
+	function renderSyncPeopleUnavailable() {
+		const actorList = document.getElementById("syncActorsList");
+		const actorMeta = document.getElementById("syncActorsMeta");
+		const syncPeers = document.getElementById("syncPeers");
+		setPeopleCreateControlsDisabled(true);
+		if (actorMeta) actorMeta.textContent = "People and device details are unavailable right now. Refresh this page to retry once local sync status is reachable again.";
+		if (actorList) renderSyncEmptyState(actorList, {
+			title: "People unavailable right now.",
+			detail: "Refresh this page to reload named people once the local sync status endpoint is responding again."
+		});
+		if (syncPeers) renderSyncEmptyState(syncPeers, {
+			title: "Devices unavailable right now.",
+			detail: "Refresh this page to reload paired devices. When sync is reachable again, you can rename, assign, or pair devices here."
+		});
+	}
 	function renderLegacyDeviceClaims() {
 		const panel = document.getElementById("syncLegacyClaims");
 		const mount = document.getElementById("syncLegacyDeviceSelectMount");
@@ -11184,6 +11542,18 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			join_requests: []
 		};
 	}
+	function hideStaleSyncSecondarySections() {
+		const sharingReview = document.getElementById("syncSharingReview");
+		const sharingReviewList = document.getElementById("syncSharingReviewList");
+		const sharingReviewMeta = document.getElementById("syncSharingReviewMeta");
+		const legacyClaims = document.getElementById("syncLegacyClaims");
+		const legacyClaimsMeta = document.getElementById("syncLegacyClaimsMeta");
+		if (sharingReview) sharingReview.hidden = true;
+		if (sharingReviewList) sharingReviewList.textContent = "";
+		if (sharingReviewMeta) sharingReviewMeta.textContent = "";
+		if (legacyClaims) legacyClaims.hidden = true;
+		if (legacyClaimsMeta) legacyClaimsMeta.textContent = "";
+	}
 	async function loadSyncData() {
 		const requestId = ++latestSyncLoadRequestId;
 		try {
@@ -11222,7 +11592,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			const statusPayload = payload.status && typeof payload.status === "object" ? payload.status : null;
 			if (statusPayload) state.lastSyncStatus = statusPayload;
 			if (Array.isArray(actorsPayload?.items)) state.lastSyncActors = actorsPayload.items;
-			else if (!actorLoadError) state.lastSyncActors = [];
+			else state.lastSyncActors = [];
 			const payloadPeers = Array.isArray(payload.peers) ? payload.peers : [];
 			const realPeerIds = new Set(payloadPeers.map((peer) => String(peer?.peer_device_id || "").trim()).filter(Boolean));
 			const pendingPeers = Array.isArray(state.pendingAcceptedSyncPeers) ? state.pendingAcceptedSyncPeers.filter((peer) => {
@@ -11251,18 +11621,17 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			renderLegacyDeviceClaims();
 			renderSyncAttempts();
 			renderHealthOverview();
-			if (actorLoadError) {
-				const actorMeta = document.getElementById("syncActorsMeta");
-				if (actorMeta) actorMeta.textContent = "People controls are temporarily unavailable. Device status and sync health still loaded.";
-			}
+			if (actorLoadError) renderSyncActorsUnavailable();
 		} catch {
 			if (requestId !== latestSyncLoadRequestId) return;
+			lastSyncHash = "";
 			hideSkeleton("syncTeamSkeleton");
 			hideSkeleton("syncActorsSkeleton");
 			hideSkeleton("syncPeersSkeleton");
 			hideSkeleton("syncDiagSkeleton");
-			const syncMeta = document.getElementById("syncMeta");
-			if (syncMeta) syncMeta.textContent = "Sync unavailable";
+			hideStaleSyncSecondarySections();
+			renderSyncPeopleUnavailable();
+			renderSyncDiagnosticsUnavailable();
 		}
 	}
 	async function loadPairingData() {
@@ -11270,6 +11639,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			state.pairingPayloadRaw = await loadPairing() || null;
 			renderPairing();
 		} catch {
+			state.pairingPayloadRaw = null;
 			renderPairing();
 		}
 	}
@@ -12924,10 +13294,60 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 		try {
 			const runtime = await loadRuntimeInfo();
 			if (!runtime?.version) return;
-			setRuntimeLabel(runtime.version, "4a76585");
+			setRuntimeLabel(runtime.version, "692076f");
 		} catch {}
 	}
 	var lastAnnouncedRefreshState = null;
+	var RECONNECT_POLL_MS = 1500;
+	var reconnectTimer = null;
+	var reconnecting = false;
+	function setReconnectOverlay(open, detail) {
+		const overlay = $$2("viewerReconnectOverlay");
+		const detailEl = $$2("viewerReconnectDetail");
+		if (!overlay || !detailEl) return;
+		overlay.hidden = !open;
+		detailEl.textContent = detail || "Trying again automatically while the viewer comes back.";
+	}
+	async function isViewerReady() {
+		try {
+			await pingViewerReady();
+			return true;
+		} catch {
+			return false;
+		}
+	}
+	function stopReconnectLoop() {
+		if (reconnectTimer) {
+			clearTimeout(reconnectTimer);
+			reconnectTimer = null;
+		}
+		reconnecting = false;
+		setReconnectOverlay(false);
+	}
+	function canResumeRefresh() {
+		return document.visibilityState !== "hidden" && !isSettingsOpen();
+	}
+	function scheduleReconnectLoop() {
+		if (reconnecting) return;
+		reconnecting = true;
+		stopPolling();
+		setRefreshStatus("error", "(reconnecting)");
+		setReconnectOverlay(true, "The viewer server is restarting or temporarily unavailable. Trying again automatically…");
+		const tick = async () => {
+			if (await isViewerReady()) {
+				stopReconnectLoop();
+				if (canResumeRefresh()) {
+					setRefreshStatus("refreshing");
+					startPolling();
+					doRefresh();
+				} else setRefreshStatus("paused", document.visibilityState === "hidden" ? "(tab hidden)" : "(settings open)");
+				return;
+			}
+			setReconnectOverlay(true, "Still reconnecting… the viewer will recover automatically as soon as the server responds.");
+			reconnectTimer = setTimeout(tick, RECONNECT_POLL_MS);
+		};
+		reconnectTimer = setTimeout(tick, RECONNECT_POLL_MS);
+	}
 	function setRefreshStatus(rs, detail) {
 		state.refreshState = rs;
 		const el = $$2("refreshStatus");
@@ -12947,6 +13367,11 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			announce("Auto refresh paused.");
 			return;
 		}
+		if (rs === "error" && detail === "(reconnecting)") {
+			el.textContent = "reconnecting…";
+			announce("Viewer reconnecting.");
+			return;
+		}
 		if (rs === "error") {
 			el.textContent = "refresh failed";
 			announce("Refresh failed.");
@@ -12970,7 +13395,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 		if (document.visibilityState === "hidden") {
 			stopPolling();
 			setRefreshStatus("paused", "(tab hidden)");
-		} else if (!isSettingsOpen()) {
+		} else if (!isSettingsOpen() && !reconnecting) {
 			startPolling();
 			refresh();
 		}
@@ -13026,10 +13451,12 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 	});
 	var refreshDebounceTimer = null;
 	async function refresh() {
+		if (reconnecting) return;
 		if (refreshDebounceTimer) clearTimeout(refreshDebounceTimer);
 		refreshDebounceTimer = setTimeout(() => doRefresh(), 80);
 	}
 	async function doRefresh() {
+		if (reconnecting) return;
 		if (state.refreshInFlight) {
 			state.refreshQueued = true;
 			return;
@@ -13044,10 +13471,11 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 			await Promise.all(promises);
 			setRefreshStatus("idle");
 		} catch {
-			setRefreshStatus("error");
+			if (!await isViewerReady()) scheduleReconnectLoop();
+			else setRefreshStatus("error");
 		} finally {
 			state.refreshInFlight = false;
-			if (state.refreshQueued) {
+			if (state.refreshQueued && !reconnecting) {
 				state.refreshQueued = false;
 				doRefresh();
 			}
@@ -13061,6 +13489,16 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
 	initSyncTab(() => refresh());
 	initSettings(stopPolling, startPolling, () => refresh());
 	loadProjects();
+	$$2("viewerReconnectRetry")?.addEventListener("click", async () => {
+		setReconnectOverlay(true, "Checking whether the viewer server is back…");
+		if (!await isViewerReady()) {
+			scheduleReconnectLoop();
+			return;
+		}
+		stopReconnectLoop();
+		startPolling();
+		doRefresh();
+	});
 	loadRuntimeLabel();
 	refresh();
 	startPolling();