@chance722/dsh-inbox 0.2.2 → 0.2.4

package/lib/client.js

@@ -624,6 +624,14 @@ window.__ModuleLoader__.load({
 		var INBOX_ENDPOINT_TAGS = "tags";
 		var INBOX_ENDPOINT_SECRET = "secret";
 		var INBOX_ENDPOINT_PUSH = "push";
+		var DEFAULT_SYNC_DIRECTORY = "inbox";
+		function syncDirectory(raw) {
+		  const trimmed = (raw ?? "").trim().replace(/^\/+|\/+$/g, "");
+		  return trimmed.length === 0 ? DEFAULT_SYNC_DIRECTORY : trimmed;
+		}
+		function syncRootFor(raw) {
+		  return `${syncDirectory(raw)}/sync`;
+		}
 		function isSuccess(status) {
 		  return status >= 200 && status < 300;
 		}
@@ -801,6 +809,11 @@ window.__ModuleLoader__.load({
 		  "settings.region": "\u533A\u57DF",
 		  "settings.bucketAddress": "\u5730\u5740",
 		  "settings.bucketDir": "\u76EE\u5F55",
+		  "settings.adoptForeign": "\u540C\u65F6\u5408\u5E76\u522B\u7684\u540C\u6B65\u76EE\u5F55",
+		  "settings.adoptForeignHint": "\uFF08\u6362\u8FC7\u76EE\u5F55\u7684\u673A\u5668\u7559\u5728\u4E91\u7AEF\u7684\u8BB0\u5F55\u4E5F\u4F1A\u62C9\u56DE\u6765\uFF1B\u9ED8\u8BA4\u5173\uFF09",
+		  // The default is the thing people get wrong: blank and `/` are the same as
+		  // `inbox`, and the sync tree is `<directory>/sync`.
+		  "settings.directoryPlaceholder": "inbox\uFF08\u9ED8\u8BA4\uFF1B\u7559\u7A7A\u6216 / \u90FD\u7B49\u4E8E\u5B83\uFF09",
 		  "settings.dirS3.lead": "\u76EE\u5F55\u90A3\u4E00\u680F\u540C\u65F6\u662F S3 \u7684 key \u524D\u7F00\uFF08\u9ED8\u8BA4 ",
 		  "settings.dirS3.mid": "\uFF0C\u4F1A\u8F6C\u6210 ",
 		  "settings.dirS3.tail": "\uFF09\u3002",
@@ -816,6 +829,7 @@ window.__ModuleLoader__.load({
 		  "settings.save": "\u4FDD\u5B58",
 		  "settings.probe": "\u81EA\u68C0",
 		  "settings.details": "\u8BE6\u60C5\uFF08{count} \u6B21\u8BF7\u6C42\uFF09",
+		  "settings.syncRootNow": "\u540C\u6B65\u6839\uFF1A{root}",
 		  "settings.noServiceBody": "\u8FD9\u4E2A\u7EC4\u5408\u91CC\u6CA1\u6709\u8BBE\u7F6E\u670D\u52A1\uFF0C\u5730\u5740\u6539\u4E0D\u4E86\u2014\u2014\u4F60\u591A\u534A\u5728\u7528 headless \u5F62\u6001\u5F00\u53D1\u3002",
 		  "settings.bucketHint": "\u522B\u7684\u8BBE\u5907\u5F80\u8FD9\u91CC\u6254\u4E1C\u897F",
 		  // Notices (the one-line status under the toolbar).
@@ -849,16 +863,24 @@ window.__ModuleLoader__.load({
 		  "sync.pushUnconfigured": "\u63A8\u9001\uFF1A\u8FD8\u6CA1\u914D\u7F6E\u8FDC\u7AEF",
 		  "sync.pushFailed": "\u63A8\u9001\u5931\u8D25\uFF1A{reason}",
 		  "sync.pushUnknown": "\u672A\u77E5\u539F\u56E0",
-		  "sync.pushUpToDate": "\u63A8\u9001\uFF1A\u6CA1\u6709\u65B0\u5185\u5BB9\uFF08{count} \u6761\u5DF2\u662F\u6700\u65B0\uFF09",
-		  "sync.pushDone": "\u63A8\u9001\uFF1A{records} \u6761\u8BB0\u5F55 / {attachments} \u4E2A\u9644\u4EF6",
 		  "sync.pushPartial": "{head} \xB7 \u90E8\u5206\u5931\u8D25\uFF1A{reason}",
 		  "sync.pullNoAddress": "\u8FD8\u6CA1\u914D\u7F6E\u5730\u5740",
 		  "sync.pullFailed": "\u62C9\u53D6\u5931\u8D25\uFF1A{reason}",
-		  "sync.pullNothingNew": "\u4E91\u7AEF\u7684\u8BB0\u5F55\u6CA1\u6709\u65B0\u7684",
-		  "sync.pullMerged": "\u4ECE\u4E91\u7AEF\u5408\u5E76 {count} \u6761{attachments}",
-		  "sync.pullAttachments": " / {count} \u4E2A\u9644\u4EF6",
-		  "sync.pullDone": "\u62C9\u53D6\u5B8C\u6210\uFF1A\u8FDC\u7AEF\u5217\u51FA {listed} \u9879\uFF0C\u65B0\u5165\u5E93 {pulled} \u6761\uFF0C\u8DF3\u8FC7 {skipped} \u6761{tail}",
-		  "sync.pullFailedCount": " \xB7 \u5931\u8D25 {count} \u6761",
+		  // The refresh button's tooltip: counts first, reasons only when something was
+		  // skipped. The toast carries the two numbers alone.
+		  "sync.detailPushedIdle": "\u63A8\u9001 0 \u6761\uFF08{count} \u6761\u5DF2\u662F\u6700\u65B0\uFF09",
+		  "sync.detailPushed": "\u63A8\u9001 {records} \u6761 / {attachments} \u4E2A\u9644\u4EF6",
+		  "sync.detailPulled": "\u62C9\u53D6 {count} \u6761 \xB7 \u4E91\u7AEF {records} \u6761\u8BB0\u5F55 / {files} \u4E2A\u9644\u4EF6",
+		  "sync.detailAdded": "\uFF08\u5176\u4E2D {count} \u6761\u662F\u65B0\u8BB0\u5F55\uFF09",
+		  "sync.detailSkip": "\uFF08\u8DF3\u8FC7 {skipped}\uFF1A\u81EA\u5DF1\u7684 {sync}\u3001\u66F4\u65E7 {older}\uFF09",
+		  "sync.pullForeignSync": " \xB7 \u26A0\uFE0F \u53E6\u6709 {records} \u6761\u8BB0\u5F55\u5728\u522B\u7684\u540C\u6B65\u76EE\u5F55\uFF1A{roots}",
+		  "sync.detailForeign": " \xB7 \u26A0\uFE0F \u522B\u7684\u540C\u6B65\u76EE\u5F55\uFF1A{roots}\uFF08{records} \u6761\u8BB0\u5F55\uFF1B\u672C\u673A {ours}\uFF09",
+		  // The toast: two numbers, nothing else. Everything else about a sync is
+		  // detail, and detail belongs in a line that does not vanish.
+		  "sync.shortPushed": "\u63A8\u9001 {count} \u6761",
+		  "sync.shortPulled": "\u62C9\u53D6 {count} \u6761",
+		  "sync.shortIdle": "\u5DF2\u662F\u6700\u65B0",
+		  "sync.pullFailures": " \xB7 \u5931\u8D25 {count}\uFF1A{reason}",
 		  "sync.thisPage": " \xB7 \u672C\u9875 {count} \u6761",
 		  "settings.status": "{settings} \xB7 {webdav} \xB7 {s3}",
 		  "settings.statusOn": "\u8BBE\u7F6E\u670D\u52A1\u5728",
@@ -927,10 +949,15 @@ window.__ModuleLoader__.load({
 		  "manual.5.auto.body": "\u5165\u5E93/\u6539\u52A8\u540E\u51E0\u79D2\u81EA\u52A8\u63A8\u9001\u4E00\u6B21\uFF08\u9632\u6296\uFF0C\u8FDE\u7740\u5B58\u4E94\u6761\u53EA\u4F1A\u63A8\u4E00\u6B21\uFF09\u3002",
 		  "manual.5.manual.label": "\u624B\u52A8",
 		  "manual.5.manual.body": "\u53F3\u4E0A\u89D2\u300C\u5237\u65B0\u300D= \u4E00\u6B21\u5B8C\u6574\u540C\u6B65\uFF1A\u5148\u63A8\u672C\u673A\u6539\u52A8\uFF0C\u518D\u62C9\u522B\u4EBA\u7684\uFF0C\u7136\u540E\u91CD\u8BFB\u5217\u8868\u3002",
+		  // The one rule that decides whether two machines see each other at all.
+		  "manual.5.twoMachines.label": "\u4E24\u53F0\u673A\u5668",
+		  "manual.5.twoMachines.body": "\u4E24\u8FB9\u7684\u300C\u76EE\u5F55\u300D\u8981\u4E00\u6837\uFF08\u7559\u7A7A\u3001/\u3001inbox \u662F\u540C\u4E00\u4E2A\u610F\u601D\uFF09\u3002\u4E0D\u4E00\u6837\u65F6\u9ED8\u8BA4\u4E0D\u4E92\u901A\uFF1A\u5237\u65B0\u4F1A\u63D0\u793A\u300C\u53E6\u6709 N \u6761\u8BB0\u5F55\u5728\u522B\u7684\u540C\u6B65\u76EE\u5F55\u300D\u2014\u2014\u628A\u5B83\u4EEC\u6539\u6210\u540C\u4E00\u4E2A\uFF0C\u6216\u8005\u6253\u5F00\u8BBE\u7F6E\u91CC\u7684\u300C\u540C\u65F6\u5408\u5E76\u522B\u7684\u540C\u6B65\u76EE\u5F55\u300D\uFF0C\u90FD\u80FD\u5408\u8FC7\u6765\u3002",
 		  "manual.5.delete.label": "\u5220\u9664",
 		  "manual.5.delete.body": "\u9762\u677F\u91CC\u7684\u300C\u5220\u9664\u300D\u53EA\u662F\u628A\u5B83\u653E\u8FDB\u56DE\u6536\u7AD9\uFF08\u522B\u7684\u8BBE\u5907\u4E5F\u4F1A\u77E5\u9053\u5B83\u88AB\u5220\u4E86\uFF0C\u4E0D\u4F1A\u53C8\u88AB\u62C9\u56DE\u6765\uFF09\uFF1B\u300C\u6E05\u7A7A\u56DE\u6536\u7AD9\u300D\u624D\u662F\u771F\u5220\uFF0C\u4E91\u7AEF\u90A3\u4EFD\u4E5F\u4F1A\u4E00\u8D77\u5220\u3002",
-		  "manual.5.conflict.label": "\u51B2\u7A81",
-		  "manual.5.conflict.body": "\u591A\u8BBE\u5907\u6539\u540C\u4E00\u6761\u6309\u65F6\u95F4\u540E\u5199\u8D62\uFF0C\u4E0D\u7559\u51B2\u7A81\u526F\u672C\u3002\u4E0A\u4E91\u7684\u5BC6\u6587\u53EA\u6709\u8D26\u5BC6\u6B63\u6587\uFF0C\u5176\u4F59\u662F\u660E\u6587 \u2014\u2014 \u6876\u52A1\u5FC5\u8981\u6709\u8BBF\u95EE\u63A7\u5236\u3002",
+		  "manual.5.merge.label": "\u5408\u5E76",
+		  "manual.5.merge.body": "\u62C9\u56DE\u6765\u6309\u8BB0\u5F55\u7684 id + \u66F4\u65B0\u65F6\u95F4\u5408\u5E76\uFF1A\u8C01\u65B0\u8C01\u8D62\uFF0C\u4E0D\u7559\u51B2\u7A81\u526F\u672C\u3002",
+		  "manual.5.cloud.label": "\u4E0A\u4E91\u4EC0\u4E48",
+		  "manual.5.cloud.body": "\u8BB0\u5F55\u4E0E\u9644\u4EF6\u4E00\u8D77\u8D70\uFF1B\u53EA\u6709\u8D26\u5BC6\u6B63\u6587\u662F\u5BC6\u6587\uFF0C\u5176\u4F59\uFF08\u6587\u672C\u3001\u94FE\u63A5\u3001\u5907\u6CE8\u3001\u9644\u4EF6\uFF09\u662F\u660E\u6587\u2014\u2014\u6876\u52A1\u5FC5\u8BBE\u8BBF\u95EE\u63A7\u5236\u3002",
 		  "manual.6.title": "6. \u5728\u5BF9\u8BDD\u91CC\u53D6\u56DE\u6765",
 		  "manual.6.query.label": "\u67E5",
 		  "manual.6.query.body": "\u5728\u5BF9\u8BDD\u91CC\u76F4\u63A5\u95EE\uFF1A\u300C\u6211\u7684\u6536\u4EF6\u7BB1\u91CC\u6709\u54EA\u4E9B\u8FD8\u6CA1\u770B\u7684\u94FE\u63A5\uFF1F\u300D\u52A9\u624B\u4F1A\u53BB\u4ED3\u5E93\u91CC\u627E\uFF0C \u6700\u591A\u5217 10 \u6761\uFF0C\u5E76\u544A\u8BC9\u4F60\u8FD8\u5269\u51E0\u6761\u3002\u53EB\u5B83\u300C\u6536\u4EF6\u7BB1\u300D\u300C\u4ED3\u5E93\u300D\u300C\u4E2A\u4EBA\u4ED3\u5E93\u300D\u8FD8\u662F\u300Cinbox\u300D\u90FD\u8BA4\u3002",
@@ -1057,6 +1084,9 @@ window.__ModuleLoader__.load({
 		  "settings.region": "Region",
 		  "settings.bucketAddress": "Address",
 		  "settings.bucketDir": "Directory",
+		  "settings.adoptForeign": "Merge other sync directories too",
+		  "settings.adoptForeignHint": "(brings back records a machine left under an older directory; off by default)",
+		  "settings.directoryPlaceholder": "inbox (the default \u2014 blank or / means the same)",
 		  "settings.dirS3.lead": "the directory is also the key prefix for S3 (default ",
 		  "settings.dirS3.mid": ", which becomes ",
 		  "settings.dirS3.tail": ").",
@@ -1072,6 +1102,7 @@ window.__ModuleLoader__.load({
 		  "settings.save": "Save",
 		  "settings.probe": "Test",
 		  "settings.details": "Details ({count} requests)",
+		  "settings.syncRootNow": "sync root: {root}",
 		  "settings.noServiceBody": "this composition has no settings service, so the address cannot be changed \u2014 you are most likely running the headless shape.",
 		  "settings.bucketHint": "other devices drop things here",
 		  "notice.listFailed": "Could not read the list: {reason}",
@@ -1103,16 +1134,20 @@ window.__ModuleLoader__.load({
 		  "sync.pushUnconfigured": "Push: no remote configured yet",
 		  "sync.pushFailed": "Push failed: {reason}",
 		  "sync.pushUnknown": "unknown reason",
-		  "sync.pushUpToDate": "Push: nothing new ({count} already current)",
-		  "sync.pushDone": "Push: {records} records / {attachments} attachment(s)",
 		  "sync.pushPartial": "{head} \xB7 partly failed: {reason}",
 		  "sync.pullNoAddress": "No address configured yet",
 		  "sync.pullFailed": "Pull failed: {reason}",
-		  "sync.pullNothingNew": "Nothing new in the cloud",
-		  "sync.pullMerged": "Merged {count} from the cloud{attachments}",
-		  "sync.pullAttachments": " / {count} attachment(s)",
-		  "sync.pullDone": "Pull done: {listed} listed remotely, {pulled} filed, {skipped} skipped{tail}",
-		  "sync.pullFailedCount": " \xB7 {count} failed",
+		  "sync.detailPushedIdle": "pushed 0 ({count} already up to date)",
+		  "sync.detailPushed": "pushed {records} / {attachments} attachments",
+		  "sync.detailPulled": "pulled {count} \xB7 the cloud holds {records} records / {files} attachments",
+		  "sync.detailAdded": " ({count} of them new)",
+		  "sync.detailSkip": " ({skipped} skipped: {sync} ours, {older} older)",
+		  "sync.pullForeignSync": " \xB7 \u26A0\uFE0F {records} records live in another sync directory: {roots}",
+		  "sync.detailForeign": " \xB7 \u26A0\uFE0F another sync directory: {roots} ({records} records; ours is {ours})",
+		  "sync.shortPushed": "pushed {count}",
+		  "sync.shortPulled": "pulled {count}",
+		  "sync.shortIdle": "up to date",
+		  "sync.pullFailures": " \xB7 {count} failed: {reason}",
 		  "sync.thisPage": " \xB7 {count} on this page",
 		  "settings.status": "{settings} \xB7 {webdav} \xB7 {s3}",
 		  "settings.statusOn": "settings service present",
@@ -1178,10 +1213,14 @@ window.__ModuleLoader__.load({
 		  "manual.5.auto.body": "a few seconds after a capture or an edit a push goes out (debounced \u2014 five quick saves push once).",
 		  "manual.5.manual.label": "Manual",
 		  "manual.5.manual.body": "\u201CRefresh\u201D in the top right is a full sync: push local changes, pull the others, then re-read the list.",
+		  "manual.5.twoMachines.label": "Two machines",
+		  "manual.5.twoMachines.body": "Both machines need the same \u300C\u76EE\u5F55\u300D (blank, / and inbox all mean the same directory). While they differ nothing crosses over by default: the refresh says \u201CN records live in another sync directory\u201D, and either matching them or ticking \u201CMerge other sync directories too\u201D brings them in.",
 		  "manual.5.delete.label": "Deleting",
 		  "manual.5.delete.body": "\u201CDelete\u201D in the panel only moves a record to the bin (other devices learn it is gone instead of pushing it back); emptying the bin is the real delete, and the cloud copy goes with it.",
-		  "manual.5.conflict.label": "Conflicts",
-		  "manual.5.conflict.body": "two devices editing one record: the later write wins, no conflict copies. Only credential bodies travel encrypted \u2014 everything else is plain text up there, so the bucket needs access control.",
+		  "manual.5.merge.label": "Merging",
+		  "manual.5.merge.body": "Incoming records merge by id + timestamp: the newer write wins, no conflict copies.",
+		  "manual.5.cloud.label": "What goes up",
+		  "manual.5.cloud.body": "Records and attachments both travel; only credential bodies are ciphertext \u2014 text, links, notes and attachments are plain text, so the bucket needs access control.",
 		  "manual.6.title": "6. Getting things back in the conversation",
 		  "manual.6.query.label": "Ask",
 		  "manual.6.query.body": "just ask: \u201Cwhich links in my inbox haven\u2019t I read yet?\u201D The assistant searches the vault, lists at most 10, and tells you how many are left. \u6536\u4EF6\u7BB1 / \u4ED3\u5E93 / inbox all mean the same shelf.",
@@ -1744,7 +1783,12 @@ window.__ModuleLoader__.load({
 		              manual ran off the bottom of the screen with no visible frame.
 		            */
 		            width: "min(560px, 100%)",
-		            maxHeight: "92vh",
+		            /*
+		              80vh rather than 92vh: at 92 the card still felt like a full screen
+		              and it pushed the panel out of sight, while the point of the manual
+		              is to be readable *beside* what it explains (asked 2026-09-21).
+		            */
+		            maxHeight: "80vh",
 		            // Border inside the width and the cap: without it the card is 2px
 		            // wider than the number and 2px taller than the overlay's room.
 		            boxSizing: "border-box",
@@ -1795,6 +1839,7 @@ window.__ModuleLoader__.load({
 		            /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
 		              "div",
 		              {
+		                className: "dsh-inbox-scroll",
 		                style: {
 		                  padding: 18,
 		                  display: "flex",
@@ -1838,8 +1883,10 @@ window.__ModuleLoader__.load({
 		                  /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Section, { title: t("manual.5.title"), children: [
 		                    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Line, { label: t("manual.5.auto.label"), children: t("manual.5.auto.body") }),
 		                    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Line, { label: t("manual.5.manual.label"), children: t("manual.5.manual.body") }),
-		                    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Line, { label: t("manual.5.delete.label"), children: t("manual.5.delete.body") }),
-		                    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Line, { label: t("manual.5.conflict.label"), children: t("manual.5.conflict.body") })
+		                    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Line, { label: t("manual.5.merge.label"), children: t("manual.5.merge.body") }),
+		                    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Line, { label: t("manual.5.twoMachines.label"), children: t("manual.5.twoMachines.body") }),
+		                    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Line, { label: t("manual.5.cloud.label"), children: t("manual.5.cloud.body") }),
+		                    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Line, { label: t("manual.5.delete.label"), children: t("manual.5.delete.body") })
 		                  ] }),
 		                  /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Section, { title: t("manual.6.title"), children: [
 		                    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Line, { label: t("manual.6.query.label"), children: t("manual.6.query.body") }),
@@ -2084,6 +2131,7 @@ window.__ModuleLoader__.load({
 		  const [text, setText] = import_react8.default.useState("");
 		  const [staged, setStaged] = import_react8.default.useState([]);
 		  const [notice, setNotice] = import_react8.default.useState();
+		  const [syncDetail, setSyncDetail] = import_react8.default.useState();
 		  const [busy, setBusy] = import_react8.default.useState(false);
 		  const [dragging, setDragging] = import_react8.default.useState(false);
 		  const picker = import_react8.default.useRef(null);
@@ -2236,19 +2284,27 @@ window.__ModuleLoader__.load({
 		    setNotice(t("notice.syncing"));
 		    try {
 		      const pushed = await call(INBOX_ENDPOINT_PUSH, {});
-		      const pushLine = pushed.ok ? describePush(pushed.value) : t("notice.pushFailed", { reason: pushed.error.message });
 		      const pulled = await call(INBOX_ENDPOINT_PULL, {});
-		      let suffix = "";
-		      if (pulled.ok) {
-		        const result = pulled.value;
-		        suffix = ` \xB7 ${describePull(result)}`;
-		      } else {
-		        suffix = ` \xB7 ${t("notice.pullFailed", { reason: pulled.error.message })}`;
-		      }
 		      await refresh();
+		      const pushFail = pushed.ok ? void 0 : t("notice.pushFailed", { reason: pushed.error.message });
+		      const pullFail = pulled.ok ? void 0 : t("notice.pullFailed", { reason: pulled.error.message });
+		      const pushCount = pushed.ok ? writtenBy(pushed.value) : 0;
+		      const pullCount = pulled.ok ? arrivedFrom(pulled.value) : 0;
+		      const warnings = pulled.ok ? syncWarnings(pulled.value) : "";
 		      const total = list?.matched;
+		      const idle = pushFail === void 0 && pullFail === void 0 && pushCount === 0 && pullCount === 0;
+		      const short = idle ? t("sync.shortIdle") : [
+		        pushFail ?? t("sync.shortPushed", { count: pushCount }),
+		        pullFail ?? t("sync.shortPulled", { count: pullCount })
+		      ].join(" \xB7 ");
 		      setNotice(
-		        `${pushLine}${suffix}${total === void 0 ? "" : t("sync.thisPage", { count: total })}`
+		        `${short}${warnings}${total === void 0 ? "" : t("sync.thisPage", { count: total })}`
+		      );
+		      setSyncDetail(
+		        [
+		          pushed.ok ? describePush(pushed.value) : t("notice.pushFailed", { reason: pushed.error.message }),
+		          pulled.ok ? describePull(pulled.value) : t("notice.pullFailed", { reason: pulled.error.message })
+		        ].join(" \xB7 ")
 		      );
 		    } finally {
 		      setBusy(false);
@@ -2449,6 +2505,28 @@ window.__ModuleLoader__.load({
 		    if (entry.url !== void 0) setZoom({ href: entry.url, label: headingOf(entry) });
 		  }, []);
 		  return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { ref: panelRef, style: { ...panelStyle, colorScheme: scheme }, children: [
+		    /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("style", { children: `
+		        /*
+		          Chromium ignores ::-webkit-scrollbar the moment the standard
+		          scrollbar-width is set, so the two engines get the rule they can use:
+		          engines that know ::-webkit-scrollbar get the 8px bar, and Firefox \u2014
+		          which does not \u2014 falls back to its own thin one. Measured: with both
+		          set, Chromium kept its 10px thin bar and the 8px rule did nothing.
+		        */
+		        @supports not selector(::-webkit-scrollbar) {
+		          .dsh-inbox-scroll { scrollbar-width: thin; }
+		        }
+		        .dsh-inbox-scroll::-webkit-scrollbar { width: 8px; height: 8px; }
+		        .dsh-inbox-scroll::-webkit-scrollbar-track { background: transparent; }
+		        .dsh-inbox-scroll::-webkit-scrollbar-thumb {
+		          background: color-mix(in srgb, currentColor 22%, transparent);
+		          border-radius: 8px;
+		        }
+		        .dsh-inbox-scroll::-webkit-scrollbar-thumb:hover {
+		          background: color-mix(in srgb, currentColor 34%, transparent);
+		        }
+		        .dsh-inbox-scroll::-webkit-scrollbar-corner { background: transparent; }
+		      ` }),
 		    /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("header", { children: /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { style: { display: "flex", alignItems: "flex-start", gap: 10 }, children: [
 		      /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { children: [
 		        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("h2", { style: { margin: "0 0 4px" }, children: "dsh-inbox" }),
@@ -2853,6 +2931,7 @@ window.__ModuleLoader__.load({
 		        "button",
 		        {
 		          type: "button",
+		          title: syncDetail,
 		          style: { ...buttonStyle, height: CONTROL_HEIGHT, boxSizing: "border-box" },
 		          disabled: busy,
 		          onClick: () => void refreshAll(),
@@ -3033,6 +3112,7 @@ window.__ModuleLoader__.load({
 		                /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
 		                  "div",
 		                  {
+		                    className: "dsh-inbox-scroll",
 		                    style: listMode === "compact" ? {
 		                      display: "flex",
 		                      flexDirection: "column",
@@ -3201,28 +3281,47 @@ window.__ModuleLoader__.load({
 		    )
 		  ] });
 		}
+		function writtenBy(result) {
+		  return result.status === "ok" || result.status === "partial" ? result.pushed : 0;
+		}
+		function arrivedFrom(result) {
+		  return result.status === "ok" ? result.pulled + (result.merged ?? 0) : 0;
+		}
+		function syncWarnings(result) {
+		  return warningsOf(result, false);
+		}
+		function warningsOf(result, verbose) {
+		  const roots = result.foreignSyncRoots ?? [];
+		  const foreign = roots.length === 0 ? "" : verbose ? t("sync.detailForeign", {
+		    roots: roots.join("\u3001"),
+		    ours: result.syncRoot ?? "",
+		    records: result.foreignRecords ?? 0
+		  }) : t("sync.pullForeignSync", { roots: roots.join("\u3001"), records: result.foreignRecords ?? 0 });
+		  const failed = result.failed > 0 ? t("sync.pullFailures", { count: result.failed, reason: result.reason ?? "" }) : "";
+		  return `${foreign}${failed}`;
+		}
 		function describePush(result) {
 		  if (result.status === "unconfigured") return t("sync.pushUnconfigured");
 		  if (result.status === "failed") return t("sync.pushFailed", { reason: result.reason ?? t("sync.pushUnknown") });
-		  const head = result.pushed === 0 && result.attachments === 0 ? t("sync.pushUpToDate", { count: result.skipped }) : t("sync.pushDone", { records: result.pushed, attachments: result.attachments });
+		  const head = result.pushed === 0 && result.attachments === 0 ? t("sync.detailPushedIdle", { count: result.skipped }) : t("sync.detailPushed", { records: result.pushed, attachments: result.attachments });
 		  return result.status === "partial" ? t("sync.pushPartial", { head, reason: result.reason ?? "" }) : head;
 		}
 		function describePull(result) {
 		  if (result.status === "unconfigured") return result.reason ?? t("sync.pullNoAddress");
 		  if (result.status === "failed") return t("sync.pullFailed", { reason: result.reason ?? t("sync.pushUnknown") });
 		  const merged = result.merged ?? 0;
-		  const attachments = result.attachments ?? 0;
-		  const syncPart = merged === 0 && attachments === 0 ? t("sync.pullNothingNew") : t("sync.pullMerged", {
-		    count: merged,
-		    attachments: attachments === 0 ? "" : t("sync.pullAttachments", { count: attachments })
+		  const head = t("sync.detailPulled", {
+		    count: result.pulled + merged,
+		    records: result.remoteRecords ?? 0,
+		    files: result.remoteAttachments ?? 0
 		  });
-		  if (result.pulled === 0 && result.skipped === 0 && result.failed === 0) return syncPart;
-		  return t("sync.pullDone", {
-		    listed: result.listed,
-		    pulled: result.pulled,
+		  const gained = (result.added ?? 0) === 0 ? "" : t("sync.detailAdded", { count: result.added ?? 0 });
+		  const skipped = result.skipped === 0 ? "" : t("sync.detailSkip", {
 		    skipped: result.skipped,
-		    tail: `${syncPart}${result.failed > 0 ? t("sync.pullFailedCount", { count: result.failed }) : ""}`
+		    sync: result.skippedSync ?? 0,
+		    older: result.skippedOlder ?? 0
 		  });
+		  return `${head}${gained}${skipped}${warningsOf(result, true)}`;
 		}
 		function EncryptionSettings({ call }) {
 		  const [status, setStatus] = import_react8.default.useState();
@@ -3317,6 +3416,7 @@ window.__ModuleLoader__.load({
 		  const [status, setStatus] = import_react8.default.useState();
 		  const [baseUrl, setBaseUrl] = import_react8.default.useState("");
 		  const [directory, setDirectory] = import_react8.default.useState("/inbox");
+		  const [adoptForeignRoots, setAdoptForeignRoots] = import_react8.default.useState(false);
 		  const [username, setUsername] = import_react8.default.useState("");
 		  const [password, setPassword] = import_react8.default.useState("");
 		  const [protocol, setProtocol] = import_react8.default.useState("webdav");
@@ -3341,6 +3441,7 @@ window.__ModuleLoader__.load({
 		    setStatus(next);
 		    setBaseUrl(next.settings.baseUrl);
 		    setDirectory(next.settings.directory);
+		    setAdoptForeignRoots(next.settings.adoptForeignRoots === true);
 		    setUsername(next.settings.username);
 		    setProtocol(next.settings.protocol);
 		    setEndpoint(next.settings.endpoint);
@@ -3370,6 +3471,7 @@ window.__ModuleLoader__.load({
 		        protocol,
 		        baseUrl,
 		        directory,
+		        adoptForeignRoots,
 		        username,
 		        // Sending nothing leaves the stored password alone; sending "" clears it.
 		        ...password.length === 0 ? {} : { password },
@@ -3471,11 +3573,15 @@ window.__ModuleLoader__.load({
 		            value: directory,
 		            disabled: busy,
 		            onChange: (event) => setDirectory(event.target.value),
-		            placeholder: "/inbox",
+		            placeholder: t("settings.directoryPlaceholder"),
 		            style: { ...inputStyle, flex: 1 }
 		          }
 		        ),
-		        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { style: { opacity: 0.6 }, children: t("settings.bucketHint") })
+		        /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("span", { style: { opacity: 0.6 }, children: [
+		          t("settings.bucketHint"),
+		          " \xB7 ",
+		          t("settings.syncRootNow", { root: syncRootFor(directory) })
+		        ] })
 		      ] }),
 		      /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("label", { style: { display: "flex", gap: 8, alignItems: "center" }, children: [
 		        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { style: { opacity: 0.7, minWidth: 64 }, children: t("settings.username") }),
@@ -3581,15 +3687,39 @@ window.__ModuleLoader__.load({
 		          }
 		        )
 		      ] }),
-		      /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("p", { style: { margin: 0, opacity: 0.6 }, children: [
-		        t("settings.dirS3.lead"),
-		        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("code", { children: "/inbox" }),
-		        t("settings.dirS3.mid"),
-		        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("code", { children: "inbox/" }),
-		        t("settings.dirS3.tail")
+		      /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("label", { style: { display: "flex", gap: 8, alignItems: "center" }, children: [
+		        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { style: { opacity: 0.7, minWidth: 64 }, children: t("settings.bucketDir") }),
+		        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+		          "input",
+		          {
+		            value: directory,
+		            disabled: busy,
+		            onChange: (event) => setDirectory(event.target.value),
+		            placeholder: t("settings.directoryPlaceholder"),
+		            style: { ...inputStyle, flex: 1 }
+		          }
+		        ),
+		        /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("span", { style: { opacity: 0.6 }, children: [
+		          t("settings.bucketHint"),
+		          " \xB7 ",
+		          t("settings.syncRootNow", { root: syncRootFor(directory) })
+		        ] })
 		      ] })
 		    ] }),
 		    /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { style: { display: "flex", gap: 8, alignItems: "center", flexWrap: "wrap" }, children: [
+		      /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("label", { style: { display: "flex", gap: 6, alignItems: "center", flex: "1 0 100%" }, children: [
+		        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+		          "input",
+		          {
+		            type: "checkbox",
+		            checked: adoptForeignRoots,
+		            disabled: busy,
+		            onChange: (event) => setAdoptForeignRoots(event.target.checked)
+		          }
+		        ),
+		        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { children: t("settings.adoptForeign") }),
+		        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { style: { opacity: 0.6 }, children: t("settings.adoptForeignHint") })
+		      ] }),
 		      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("button", { type: "button", style: buttonStyle, disabled: busy, onClick: () => void save(), children: t("settings.save") }),
 		      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("button", { type: "button", style: buttonStyle, disabled: busy, onClick: () => void selfTest(), children: t("settings.probe") }),
 		      detailNotice(notice)
@@ -4020,6 +4150,7 @@ window.__ModuleLoader__.load({
 		      /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
 		        "div",
 		        {
+		          className: "dsh-inbox-scroll",
 		          style: {
 		            flex: 1,
 		            minHeight: 0,