strom-research 1.18.0-beta.5 → 1.18.0-beta.7

package/CHANGELOG.cs.md

@@ -7,7 +7,7 @@ Změny každé verze ve zkratce. Úplné poznámky a instalační řádky jsou n
 
 ## 1.18.0
 
-*Připravuje se: bety do 1.18.0-beta.5. Oddíl bude úplný s vydáním.*
+*Připravuje se: bety do 1.18.0-beta.7. Oddíl bude úplný s vydáním.*
 
 - **Fotky z telefonu nastojato.** Fotka otočená podle údaje EXIF se čte tak, jak se má dívat, nastojato; místa na ní
   vyznačená (výřezy, poloviny dvoustrany, uložená část) jsou místa obrázku, jak se ukazuje. Fotka sama zůstává, jak
@@ -30,7 +30,9 @@ Změny každé verze ve zkratce. Úplné poznámky a instalační řádky jsou n
   rozhodnutí, posledních 24 hodin a poslední změny, obnovené každých 10 sekund, dokud je stránka na očích — jen
   k podívání: v telefonu se nic neodpovídá, nespouští ani nerozhoduje. Nedostupný počítač stránka řekne i s posledními
   údaji a jejich časem. Otevře strom, jehož QR kód ji spároval, a jde přidat na plochu jako ikona, která ji otevře
-  bez nového párování.
+  bez nového párování. Co čeká a změny jdou na telefonu přečíst celé: text toho, co čeká, se neořezává, další položky
+  nad prvních 20 se donačtou klepnutím a změna s víc řádky se rozbalí celá; Co čeká je poslední částí stránky. Změna
+  starší než dnešek má u času i datum (rok jen u loňských a starších).
 - **Souhlas v jednom jazyce.** Souhlas, který dává jen člověk (rozbalení výzkumu, odebrání stromu, odmítnuté okno),
   zazní celý v jazyce výzkumu, nic z něj nezůstane anglicky.
 - **Odmítnutá aktualizace.** Když se `strom update` odmítne, řekne, že se nic nenainstalovalo a která verze zůstává,

package/CHANGELOG.de.md

@@ -7,7 +7,7 @@ Die Änderungen jeder Version in Kürze. Die vollständigen Hinweise und die Ins
 
 ## 1.18.0
 
-*In Vorbereitung: die Betas bis 1.18.0-beta.5. Der Abschnitt ist mit dem Release vollständig.*
+*In Vorbereitung: die Betas bis 1.18.0-beta.7. Der Abschnitt ist mit dem Release vollständig.*
 
 - **Handyfotos aufrecht.** Ein Foto, das nach seiner EXIF-Ausrichtung gedreht ist, wird gelesen, wie es gesehen
   werden soll, aufrecht; die darauf markierten Stellen (Ausschnitte, die Hälften einer Doppelseite, ein gespeicherter
@@ -34,7 +34,10 @@ Die Änderungen jeder Version in Kürze. Die vollständigen Hinweise und die Ins
   Sekunden aufgefrischt, solange die Seite angesehen wird — nur zum Ansehen: auf dem Handy wird nichts beantwortet,
   gestartet oder entschieden. Ein unerreichbarer Computer wird gesagt, mit den letzten Daten und ihrer Zeit. Die Seite
   öffnet den Stammbaum, dessen QR-Code sie gekoppelt hat, und lässt sich als Symbol auf den Home-Bildschirm legen,
-  das sie ohne neues Koppeln öffnet.
+  das sie ohne neues Koppeln öffnet. Was wartet und die Änderungen lassen sich auf dem Handy ganz lesen: kein Text
+  dessen, was wartet, wird gekürzt, mehr als die ersten 20 kommen auf Antippen, eine Änderung mit vielen Zeilen klappt
+  ganz auf; Was wartet ist der letzte Teil der Seite. Eine Änderung vor heute hat bei der Uhrzeit auch ihr Datum (das
+  Jahr nur, wenn es nicht das laufende ist).
 - **Eine Zustimmung in einer Sprache.** Eine Zustimmung, die nur ein Mensch gibt (eine Forschung entpacken, einen
   Stammbaum entfernen, ein abgelehntes Fenster), steht ganz in der Sprache der Forschung, nichts davon bleibt
   Englisch.

package/CHANGELOG.md

@@ -7,7 +7,7 @@ The changes of each version in short. The full notes and the install lines are o
 
 ## 1.18.0
 
-*In preparation: the betas up to 1.18.0-beta.5. The section is complete with the release.*
+*In preparation: the betas up to 1.18.0-beta.7. The section is complete with the release.*
 
 - **Phone photos upright.** A photo turned by its EXIF orientation is read as it is meant to be seen, upright; the
   places marked on it (excerpts, the halves of a spread, a cut-out part) are of the picture as it is shown. The
@@ -32,7 +32,10 @@ The changes of each version in short. The full notes and the install lines are o
   what waits for a decision, the last 24 hours and the latest changes, refreshed every 10 seconds while the page is
   looked at — only to look at: nothing on the phone answers, starts or decides anything. A computer out of reach is
   said, with the last data and their time. The page opens the tree whose QR code paired it, and it can be added to
-  the home screen as an icon that opens it without pairing again.
+  the home screen as an icon that opens it without pairing again. What waits and the changes read whole on the phone:
+  no text of what waits is cut, more of it than the first 20 comes on a tap, a change of many lines unfolds whole;
+  What waits is the last part of the page. A change older than today has its date beside the time (the year only when
+  it is not this one).
 - **A consent in one language.** A consent only a person gives (unpacking a research, removing a tree, a window said
   no to) is said whole in the research's language, nothing of it left in English.
 - **An update said no to.** When `strom update` is declined, it says nothing was installed and which version stays,

package/assets/lang/cs.json

@@ -1403,7 +1403,9 @@
   "ui.phone.page.waiting.title": "Co čeká",
   "ui.phone.page.waiting.none": "Nic nečeká.",
   "ui.phone.page.waiting.where": "Rozhodnout jde na počítači v Přehledu výzkumu.",
-  "ui.phone.page.waiting.more": "{n, plural, one {a # další na počítači} few {a # další na počítači} other {a # dalších na počítači}}",
+  "ui.phone.page.waiting.more": "{n, plural, one {Ukázat další · zbývá #} few {Ukázat další · zbývají #} other {Ukázat další · zbývá #}}",
+  "ui.phone.page.waiting.loading": "Načítá se…",
+  "ui.phone.page.waiting.rest": "{n, plural, one {a # další v Přehledu výzkumu na počítači} few {a # další v Přehledu výzkumu na počítači} other {a # dalších v Přehledu výzkumu na počítači}}",
   "ui.phone.page.day": "Posledních 24 h",
   "ui.phone.page.day.people": "{n, plural, one {osoba} few {osoby} other {osob}}",
   "ui.phone.page.day.sources": "{n, plural, one {pramen} few {prameny} other {pramenů}}",
@@ -1412,6 +1414,7 @@
   "ui.phone.page.log.more": "Starší změny jsou v Přehledu výzkumu na počítači.",
   "ui.phone.page.log.new": "{n, plural, one {# nová změna ↑} few {# nové změny ↑} other {# nových změn ↑}}",
   "ui.phone.page.log.lines": "{n, plural, one {a # další} few {a # další} other {a # dalších}}",
+  "ui.phone.page.log.fold": "Sbalit",
   "ui.phone.page.log.none": "Zatím se nic neuložilo.",
   "ui.settings.phone": "Propojení s telefonem (fotky z telefonu do výzkumu v místní síti): {state}",
   "ui.settings.phone.on": "zapnuto, spárované telefony: {n}",

package/assets/lang/de.json

@@ -1403,7 +1403,9 @@
   "ui.phone.page.waiting.title": "Wartet",
   "ui.phone.page.waiting.none": "Nichts wartet.",
   "ui.phone.page.waiting.where": "Entscheiden lässt sich am Computer in der Forschungsübersicht.",
-  "ui.phone.page.waiting.more": "{n, plural, one {und # weiteres am Computer} other {und # weitere am Computer}}",
+  "ui.phone.page.waiting.more": "{n, plural, one {Weitere zeigen · noch #} other {Weitere zeigen · noch #}}",
+  "ui.phone.page.waiting.loading": "Wird geladen…",
+  "ui.phone.page.waiting.rest": "{n, plural, one {und # weiteres in der Forschungsübersicht am Computer} other {und # weitere in der Forschungsübersicht am Computer}}",
   "ui.phone.page.day": "Letzte 24 Std.",
   "ui.phone.page.day.people": "{n, plural, one {Person} other {Personen}}",
   "ui.phone.page.day.sources": "{n, plural, one {Quelle} other {Quellen}}",
@@ -1412,6 +1414,7 @@
   "ui.phone.page.log.more": "Ältere Änderungen stehen in der Forschungsübersicht am Computer.",
   "ui.phone.page.log.new": "{n, plural, one {# neue Änderung ↑} other {# neue Änderungen ↑}}",
   "ui.phone.page.log.lines": "{n, plural, one {und # weitere} other {und # weitere}}",
+  "ui.phone.page.log.fold": "Weniger zeigen",
   "ui.phone.page.log.none": "Noch nichts gespeichert.",
   "ui.settings.phone": "Verbindung mit dem Telefon (Fotos vom Telefon in die Forschung im lokalen Netz): {state}",
   "ui.settings.phone.on": "an, gekoppelte Telefone: {n}",

package/assets/phone/index.html

@@ -58,13 +58,6 @@
         <ul id="nowLines" class="lines"></ul>
         <div id="nowIdle" hidden><p class="idle-row"><span class="ring" aria-hidden="true"></span><span id="nowIdleText"></span></p><p id="nowIdleLast" class="quiet small"></p></div>
       </section>
-      <section id="waitCard" class="card">
-        <h2 id="waitTitle" class="cap"></h2>
-        <p id="waitNone" class="quiet" hidden></p>
-        <ul id="waitList" class="waits"></ul>
-        <p id="waitMore" class="quiet small" hidden></p>
-        <p id="waitWhere" class="quiet small"></p>
-      </section>
       <section id="dayCard" class="card" hidden>
         <h2 id="dayTitle" class="cap"></h2>
         <div class="day">
@@ -79,6 +72,15 @@
         <ul id="logList" class="log"></ul>
         <p id="logMore" class="quiet small" hidden></p>
       </section>
+      <!-- the last: each text whole, more of them asked for on a tap -->
+      <section id="waitCard" class="card">
+        <h2 id="waitTitle" class="cap"></h2>
+        <p id="waitNone" class="quiet" hidden></p>
+        <ul id="waitList" class="waits"></ul>
+        <p class="morerow"><button id="waitMore" class="linkbtn" type="button" hidden></button></p>
+        <p id="waitRest" class="quiet small" hidden></p>
+        <p id="waitWhere" class="quiet small"></p>
+      </section>
     </div>
     <p class="homerow"><button id="homeBtn" class="linkbtn" type="button" hidden></button></p>
     <section id="homeCard" class="card" hidden>

package/assets/phone/phone.css

@@ -74,18 +74,23 @@ button{font:inherit;color:inherit}
 .waits li{display:grid;grid-template-columns:8px minmax(0,1fr);gap:10px;padding:8px 0;border-top:1px solid var(--divider)}
 .waits li:first-child{border-top:0;padding-top:0}
 .waits .wdot{width:8px;height:8px;border-radius:50%;background:var(--waiting-dot);margin-top:7px}
-.waits .what{font-size:14.5px;font-weight:500}
-.waits .on{font-size:13px;color:var(--text-light);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.waits .what{font-size:14.5px;font-weight:500;overflow-wrap:anywhere}
+.waits .on{font-size:13px;color:var(--text-light);overflow-wrap:anywhere;margin-top:2px}
 #waitCard.none{display:flex;align-items:baseline;gap:12px;flex-wrap:wrap}
 #waitCard.none .cap,#waitCard.none p{margin:0}
-#waitWhere,#waitMore,#logMore{margin:10px 0 0}
+#waitWhere,#waitRest,#logMore{margin:10px 0 0}
+.morerow{margin:6px 0 0}
+.morerow .linkbtn{padding:10px 0;min-height:44px;text-align:left}
+.morerow .linkbtn:disabled{color:var(--text-faint);text-decoration:none;cursor:default}
 .day{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:8px}
 .day b{display:block;font-size:20px;font-weight:600;font-variant-numeric:tabular-nums}
 .day span{font-size:12.5px;color:var(--text-light)}
-.log li{display:grid;grid-template-columns:42px minmax(0,1fr);gap:8px;padding:7px 6px;margin:0 -6px;border-radius:8px}
-.log time{font-size:13px;color:var(--text-faint);font-variant-numeric:tabular-nums;padding-top:1px}
-.log p{margin:0;font-size:14px}
+.log{display:grid;grid-template-columns:fit-content(88px) minmax(0,1fr)}
+.log li{grid-column:1/-1;display:grid;grid-template-columns:fit-content(88px) minmax(0,1fr);grid-template-columns:subgrid;gap:8px;padding:7px 6px;margin:0 -6px;border-radius:8px}
+.log time{min-width:42px;overflow-wrap:normal;font-size:13px;color:var(--text-faint);font-variant-numeric:tabular-nums;padding-top:1px}
+.log p{margin:0;font-size:14px;overflow-wrap:anywhere}
 .log .more{font-size:13px;color:var(--text-faint)}
+.log .unfold{display:block;background:none;border:0;padding:6px 0;margin:0;min-height:32px;font:inherit;font-size:13px;color:var(--primary);text-align:left;cursor:pointer}
 .log li.fresh{background:var(--primary-soft)}
 .newpill{position:fixed;top:calc(72px + env(safe-area-inset-top));left:50%;transform:translateX(-50%);z-index:7;border:0;border-radius:999px;background:var(--primary);color:var(--on-primary);padding:0 16px;min-height:36px;font-size:13px;font-weight:600;cursor:pointer;box-shadow:0 2px 8px rgba(20,16,8,.25)}
 

package/assets/phone/phone.js

@@ -68,7 +68,9 @@
   const t = (key, v = {}) => fill(T[key] ?? key, v);
   // a small photo is never "0.0 MB"
   const mb = (bytes) => new Intl.NumberFormat(LANG, { minimumFractionDigits: 1, maximumFractionDigits: 1 }).format(bytes > 0 ? Math.max(0.1, bytes / 1024 / 1024) : 0);
-  const hhmm = (ms) => new Intl.DateTimeFormat(LANG, { hour: "2-digit", minute: "2-digit" }).format(new Date(ms));
+  // a 12-hour clock without a leading zero ("2:05 PM"), a 24-hour one with it ("09:07")
+  const HOUR = /^h1[12]$/u.test(new Intl.DateTimeFormat(LANG, { hour: "numeric" }).resolvedOptions().hourCycle ?? "") ? "numeric" : "2-digit";
+  const hhmm = (ms) => new Intl.DateTimeFormat(LANG, { hour: HOUR, minute: "2-digit" }).format(new Date(ms));
   const fold = (s) => String(s).normalize("NFD").replace(/\p{M}/gu, "").toLowerCase();
   const rid = () => Array.from(crypto.getRandomValues(new Uint8Array(16)), (b) => b.toString(16).padStart(2, "0")).join("").replace(/^(.{8})(.{4})(.{4})(.{4})/, "$1-$2-$3-$4-");
   const el = (tag, cls, text) => {
@@ -164,6 +166,8 @@
     shown: null, // what the tree shown does: now, lastWorked, waiting, day, latest
     logTree: "", // the tree and its newest change the progress shows
     logLatest: "",
+    waitLoaded: null, // more of what waits, asked for on a tap: {tree, of (what the overview gave then), n, items}
+    waitBusy: false,
     newCount: 0, // changes added above while scrolled down
     returning: false, // the page looked at again: the first answer after it awaited
   };
@@ -259,6 +263,7 @@
       if (asked === S.tree) {
         S.shown = r.body.shown || null;
         if (S.shown && S.shown.latest && (S.logTree !== S.tree || S.logLatest !== S.shown.latest)) void loadLog(S.tree, S.shown.latest);
+        keepWait();
       } else {
         S.shown = null;
         setTimeout(() => void refresh(), 0);
@@ -287,6 +292,34 @@
       if (S.shown && S.shown.latest && (S.logTree !== S.tree || S.logLatest !== S.shown.latest)) void loadLog(S.tree, S.shown.latest);
     })());
 
+  // more of what waits than the overview gives, the first ones of the same list again with them
+  const WAIT_PAGE = 50;
+  const WAIT_MAX = 200;
+  let waitAsking = null;
+  const loadWait = (count, quiet = false) =>
+    (waitAsking ??= (async () => {
+      const tree = S.tree;
+      const of = JSON.stringify(S.shown && S.shown.waiting);
+      // asked on a tap: the button says so (asked again after an answer: nothing changes till it comes)
+      if (!quiet) {
+        S.waitBusy = true;
+        drawWait();
+      }
+      const r = await ask(`/phone/waiting?tree=${encodeURIComponent(tree)}&from=0&limit=${Math.min(WAIT_MAX, count)}`);
+      waitAsking = null;
+      S.waitBusy = false;
+      if (tree === S.tree && r.status === 200 && Array.isArray(r.body.items)) S.waitLoaded = { tree, of, n: Number(r.body.n) || 0, items: r.body.items };
+      drawWait();
+    })());
+  // more of what waits asked for, kept over each answer: what waits another, asked again as many (all of it in the
+  // overview: none)
+  const keepWait = () => {
+    const w = S.shown && S.shown.waiting;
+    if (!S.waitLoaded || JSON.stringify(w) === S.waitLoaded.of) return;
+    if (!w || !Array.isArray(w.items) || w.n <= w.items.length) S.waitLoaded = null;
+    else void loadWait(S.waitLoaded.items.length, true);
+  };
+
   // ── each photo: its SHA-256, in the research already?, sent ──────────────────────────────────────────────────────
   let worker = null;
   const waiting = new Map();
@@ -641,7 +674,16 @@
   // a time of today, else its day too
   const atTime = (iso) => {
     const d = new Date(iso);
-    return sameDay(d, new Date()) ? hhmm(d) : new Intl.DateTimeFormat(LANG, { day: "numeric", month: "numeric", hour: "2-digit", minute: "2-digit" }).format(d);
+    return sameDay(d, new Date()) ? hhmm(d) : new Intl.DateTimeFormat(LANG, { day: "numeric", month: "numeric", hour: HOUR, minute: "2-digit" }).format(d);
+  };
+  // a change's time: of today the time alone, else its day before it (the year when not this one), broken only
+  // between the two
+  const logTime = (ms, now = new Date()) => {
+    const d = new Date(ms);
+    if (sameDay(d, now)) return hhmm(d);
+    const day = new Intl.DateTimeFormat(LANG, { day: "numeric", month: "numeric", ...(d.getFullYear() !== now.getFullYear() ? { year: "numeric" } : {}) }).format(d);
+    const whole = (text) => text.replace(/\s/gu, "\u00a0");
+    return `${whole(day)} ${whole(hhmm(d))}`;
   };
   const whenOf = (iso) => {
     const d = new Date(iso);
@@ -689,26 +731,7 @@
       $("nowIdleLast").hidden = !o.lastWorked;
       if (o.lastWorked) $("nowIdleLast").textContent = t("now.idleLast", { when: whenOf(o.lastWorked) });
     }
-    const w = o.waiting && Array.isArray(o.waiting.items) ? o.waiting : { n: 0, items: [] };
-    if (!archive && changed("wait", w)) {
-      $("waitCard").classList.toggle("none", !w.n);
-      $("waitTitle").textContent = w.n ? t("waiting", { n: w.n }) : t("waiting.title");
-      $("waitNone").hidden = w.n > 0;
-      $("waitList").replaceChildren(
-        ...w.items.map((x) => {
-          const li = el("li");
-          const box = el("div");
-          box.append(el("div", "what", x.what));
-          if (x.on) box.append(el("div", "on", x.on));
-          li.append(el("span", "wdot"), box);
-          return li;
-        }),
-      );
-      $("waitList").hidden = !w.n;
-      $("waitMore").hidden = w.n <= w.items.length;
-      if (w.n > w.items.length) $("waitMore").textContent = t("waiting.more", { n: w.n - w.items.length });
-      $("waitWhere").hidden = !w.n;
-    }
+    if (!archive) drawWait();
     $("dayCard").hidden = !o.day;
     if (o.day && changed("day", o.day)) {
       const plus = (n) => (n > 0 ? "+" : "") + count(n);
@@ -722,16 +745,68 @@
     $("logCard").hidden = S.logTree !== S.tree;
   };
 
+  // what waits, each text whole: the overview's first ones, or more of them asked for (kept till what waits is another)
+  const drawWait = () => {
+    const tree = treeById(S.tree);
+    const o = S.shown;
+    if (!tree || !o || tree.archive) return;
+    const first = o.waiting && Array.isArray(o.waiting.items) ? o.waiting : { n: 0, items: [] };
+    const more = S.waitLoaded && S.waitLoaded.tree === S.tree && S.waitLoaded.items.length > first.items.length ? S.waitLoaded : null;
+    const w = more ? { n: more.n, items: more.items } : first;
+    if (!changed("wait", [w, S.waitBusy])) return;
+    $("waitCard").classList.toggle("none", !w.n);
+    $("waitTitle").textContent = w.n ? t("waiting", { n: w.n }) : t("waiting.title");
+    $("waitNone").hidden = w.n > 0;
+    $("waitList").replaceChildren(
+      ...w.items.map((x) => {
+        const li = el("li");
+        const box = el("div");
+        box.append(el("div", "what", x.what));
+        if (x.on) box.append(el("div", "on", x.on));
+        li.append(el("span", "wdot"), box);
+        return li;
+      }),
+    );
+    $("waitList").hidden = !w.n;
+    const left = Math.max(0, w.n - w.items.length);
+    const can = left > 0 && w.items.length < WAIT_MAX;
+    $("waitMore").hidden = !can;
+    $("waitMore").disabled = S.waitBusy;
+    if (can) $("waitMore").textContent = S.waitBusy ? t("waiting.loading") : t("waiting.more", { n: left });
+    $("waitRest").hidden = !left || can;
+    if (left && !can) $("waitRest").textContent = t("waiting.rest", { n: left });
+    $("waitWhere").hidden = !w.n;
+  };
+
   // the progress: the changes drawn kept by their id, a new one put on top (lit for 6 s); scrolled down, what is under
   // the finger stays where it is and a pill says how many came above
   const logItems = new Map();
   const drawChange = (c) => {
     const li = el("li");
-    const time = el("time", "", hhmm(Date.parse(c.at)));
+    const time = el("time", "", logTime(Date.parse(c.at)));
     time.dateTime = c.at;
     const box = el("div");
     for (const line of c.lines || []) box.append(el("p", "", line));
-    if (c.more) box.append(el("p", "more", t("log.lines", { n: c.more })));
+    // its other lines unfolded on a tap (the change drawn is kept: a new answer folds nothing)
+    const rest = Array.isArray(c.rest) ? c.rest : [];
+    if (c.more && rest.length) {
+      const hid = el("div", "rest");
+      hid.hidden = true;
+      hid.id = `rest-${c.id}`;
+      for (const line of rest) hid.append(el("p", "", line));
+      if (c.more > rest.length) hid.append(el("p", "more", t("log.lines", { n: c.more - rest.length })));
+      const unfold = el("button", "unfold", t("log.lines", { n: c.more }));
+      unfold.type = "button";
+      unfold.setAttribute("aria-expanded", "false");
+      unfold.setAttribute("aria-controls", hid.id);
+      unfold.onclick = () => {
+        const open = hid.hidden;
+        hid.hidden = !open;
+        unfold.setAttribute("aria-expanded", String(open));
+        unfold.textContent = open ? t("log.fold") : t("log.lines", { n: c.more });
+      };
+      box.append(hid, unfold);
+    } else if (c.more) box.append(el("p", "more", t("log.lines", { n: c.more })));
     li.append(time, box);
     return li;
   };
@@ -775,6 +850,17 @@
     }
     renderPill();
   };
+  // past midnight the changes of the day before get their day (asked every second, drawn again once a day)
+  let logDay = "";
+  const restampLog = (now = new Date()) => {
+    const day = now.toDateString();
+    if (day === logDay) return;
+    logDay = day;
+    for (const li of logItems.values()) {
+      const time = li.children[0];
+      time.textContent = logTime(Date.parse(time.dateTime), now);
+    }
+  };
   const renderPill = () => {
     if (window.scrollY <= 4) S.newCount = 0;
     $("newPill").hidden = !S.newCount || S.view !== "main";
@@ -980,6 +1066,7 @@
     closeTrees();
     if (S.tree !== id) {
       S.shown = null;
+      S.waitLoaded = null;
       S.logTree = "";
       for (const li of logItems.values()) li.remove();
       logItems.clear();
@@ -1078,6 +1165,10 @@
   $("personClear").setAttribute("aria-label", t("remove"));
 
   $("plainRetry").onclick = () => start("");
+  $("waitMore").onclick = () => {
+    const w = S.waitLoaded && S.waitLoaded.tree === S.tree ? S.waitLoaded : S.shown && S.shown.waiting;
+    if (w && Array.isArray(w.items)) void loadWait(w.items.length + WAIT_PAGE);
+  };
   $("photoBtn").onclick = $("morePhotoBtn").onclick = () => $("photoInput").click();
   $("galleryBtn").onclick = $("moreGalleryBtn").onclick = () => $("galleryInput").click();
   $("photoInput").onchange = (e) => {
@@ -1210,6 +1301,7 @@
     ticks++;
     if (S.view === "main") {
       renderHeader();
+      restampLog();
       if (ticks % 10 === 0 && document.visibilityState !== "hidden") void refresh();
     } else if (S.view === "unpaired" && ticks % 10 === 0) void whoami().then((w) => w === "paired" && void refresh());
   }, 1000);

package/dist/cli/ui.js

@@ -1304,7 +1304,9 @@ export const UI = {
     "ui.phone.page.waiting.title": "Waiting",
     "ui.phone.page.waiting.none": "Nothing is waiting.",
     "ui.phone.page.waiting.where": "Decisions are made on the computer in the Research overview.",
-    "ui.phone.page.waiting.more": "{n, plural, one {and # more on the computer} other {and # more on the computer}}",
+    "ui.phone.page.waiting.more": "{n, plural, one {Show more · # left} other {Show more · # left}}",
+    "ui.phone.page.waiting.loading": "Loading…",
+    "ui.phone.page.waiting.rest": "{n, plural, one {and # more in the Research overview on the computer} other {and # more in the Research overview on the computer}}",
     "ui.phone.page.day": "Last 24 h",
     "ui.phone.page.day.people": "{n, plural, one {person} other {people}}",
     "ui.phone.page.day.sources": "{n, plural, one {source} other {sources}}",
@@ -1313,6 +1315,7 @@ export const UI = {
     "ui.phone.page.log.more": "Older changes are in the Research overview on the computer.",
     "ui.phone.page.log.new": "{n, plural, one {# new change ↑} other {# new changes ↑}}",
     "ui.phone.page.log.lines": "{n, plural, one {and # more} other {and # more}}",
+    "ui.phone.page.log.fold": "Show less",
     "ui.phone.page.log.none": "Nothing saved yet.",
     "ui.settings.phone": "Phone connection (photos from a phone into the research on the local network): {state}",
     "ui.settings.phone.on": "on, paired phones: {n}",

package/dist/core/live-read.js

@@ -222,9 +222,13 @@ export function statusReads(seen, now = Date.now()) {
         .map((r) => r.read)
         .filter((r) => !FINAL_STATES.includes(r.state) || Date.parse(r.since) > now - STATUS_DAYS * DAY_MS);
 }
-/** GET /reads: the last 90 days, and every reading no source of the research is of. */
+/**
+ * GET /reads: the last 90 days, and every reading no source of the research is of. inSource: a source of this tree —
+ * the only one a reading can be of (its input, state and result are the tree's; the sync takes no other's) — and not
+ * retracted (a sync undone, a source merged away): the reading is then to be come back to again.
+ */
 export function listedReads(tree, seen, now = Date.now()) {
-    const inSources = new Set(tree.list("source").map((s) => s.reading).filter((r) => typeof r === "string"));
+    const inSources = new Set(tree.list("source").flatMap((s) => (!s.retracted && typeof s.reading === "string" ? [s.reading] : [])));
     return seen
         .all()
         .map((r) => ({ ...r.read, inSource: inSources.has(r.read.id) }))

package/dist/core/phone-send.js

@@ -5,8 +5,10 @@
 //                                  (this computer converts HEIC: else the page asks the phone for JPEG), max (the largest
 //                                  file, MB); of the tree asked, what it shows (phone-watch.ts): now, lastWorked, waiting,
 //                                  day, latest (a tree asked that is gone: 404 phone.tree-gone, as /phone/log)
-//   GET  /phone/log?tree=&limit=   the last changes the research saved, newest first ({changes: [{id, at, lines, more?}],
-//                                  more}), at most 20
+//   GET  /phone/log?tree=&limit=   the last changes the research saved, newest first ({changes: [{id, at, lines, more?,
+//                                  rest?}], more}), at most 20; rest: the lines of a change past the 3 shown
+//   GET  /phone/waiting?tree=&from=&limit=   more of what waits than the state gives ({n, items: [{what, on?}]}), of the
+//                                  same list, at most 200 at once
 //   GET  /phone/people?tree=&q=    up to 8 people of the tree matching q (2 letters at least; case, accents and NFD
 //                                  aside): {id, name, birth, death, place}
 //   GET  /phone/media/<sha256>?tree=   is that content in the research already ({known: false} or {known, kind})
@@ -30,7 +32,7 @@ import { waysHere } from "./readable.js";
 import { birthEvent, deathEvent, displayName, findPersons } from "./people.js";
 import { yearLabel } from "./gdate.js";
 import { foldText } from "./text.js";
-import { LOG_PHONE, treeLog, treeMarks, treeOverview } from "./phone-watch.js";
+import { LOG_PHONE, WAITING_ASKED, WAITING_SHOWN, treeLog, treeMarks, treeOverview, treeWaiting } from "./phone-watch.js";
 /** How often the batches of a phone are looked at, and the parts of uploads cut short. */
 const INCOMING_EVERY_MS = 60 * 60_000;
 export function phoneSend(env, note) {
@@ -128,6 +130,22 @@ export function phoneSend(env, note) {
                 const limit = Math.min(LOG_PHONE, Math.max(1, Number.parseInt(url.searchParams.get("limit") ?? "", 10) || LOG_PHONE));
                 reply(200, treeLog(t.root, env, limit));
             };
+        if (req.method === "GET" && p === "/phone/waiting")
+            return () => {
+                if (foreign())
+                    return refuse(403, refusal("only the phone's page asks", "phone.origin"));
+                req.resume();
+                const t = treeOf();
+                if (!t)
+                    return gone();
+                const number = (name, or) => {
+                    const n = Number.parseInt(url.searchParams.get(name) ?? "", 10);
+                    return Number.isFinite(n) ? n : or;
+                };
+                const from = Math.max(0, number("from", WAITING_SHOWN));
+                const limit = Math.min(WAITING_ASKED, Math.max(1, number("limit", WAITING_ASKED)));
+                reply(200, treeWaiting(t.root, env, from, limit));
+            };
         if (req.method === "GET" && p === "/phone/people")
             return () => {
                 if (foreign())

package/dist/core/phone-watch.js

@@ -21,10 +21,13 @@ import { ALL_PREFIXES } from "./model.js";
 /** How long the overview of the tree shown is kept (the page asks every 10 s); the marks of the other trees in the switcher. */
 export const OVERVIEW_MS = 15_000;
 const MARKS_MS = 60_000;
-/** At most so many changes the page shows; so many lines of one change, and of what waits. */
+/** At most so many changes the page shows; so many lines of one change shown, and kept to be unfolded on the phone. */
 export const LOG_PHONE = 20;
 const LINES_PER_CHANGE = 3;
-const WAITING_SHOWN = 20;
+const LINES_KEPT = 200;
+/** So many of what waits the overview gives; more asked by the page, at most so many at once. */
+export const WAITING_SHOWN = 20;
+export const WAITING_ASKED = 200;
 // A record's ID standing alone (every prefix of the model, a document read's D + its time + 4 hex); a list of them
 // (", ", a dash, a short word between two: "H0005, H0010, …", "T0400 und T0401") goes as one.
 const ALONE = String.raw `(?<![\p{L}\p{M}\p{N}])`;
@@ -125,6 +128,7 @@ function waitingOf(tree, env, all) {
     });
 }
 const marksKept = new Map();
+// what waits is kept whole beside the overview: the page asks for more of the same list the overview began
 const overviewKept = new Map();
 const logKept = new Map();
 /** An agent at work on a tree, and how much waits for the person (none of either in an archive). */
@@ -154,6 +158,7 @@ export function treeOverview(root, env) {
         return { ...kept.value, ...day, ...latest };
     const tree = Tree.open(root, env);
     let value;
+    let waits = [];
     if (actsAsArchive(tree))
         value = { now: [], waiting: { n: 0, items: [] } };
     else {
@@ -171,18 +176,32 @@ export function treeOverview(root, env) {
         });
         const sessions = tree.list("session");
         const last = sessions.map((s) => s.ended ?? s.started).sort().at(-1);
-        const waits = waitingOf(tree, env, all);
-        // a text of nothing but IDs, paths and links: said in general
-        const items = waits.slice(0, WAITING_SHOWN).map(({ item }) => {
-            const on = item.on ? forPhone(humanTask(tree, item.on, tree.lang)) : "";
-            return { what: forPhone(humanTask(tree, item.what, tree.lang)) || ui(tree.lang, "ui.phone.waiting.item"), ...(on ? { on } : {}) };
-        });
+        waits = waitingOf(tree, env, all);
+        const items = waits.slice(0, WAITING_SHOWN).map((w) => waitingLine(tree, w));
         value = { now, ...(!now.length && last ? { lastWorked: last } : {}), waiting: { n: waits.length, items } };
         marksKept.set(root, { at: Date.now(), value: { working: now.some((l) => !l.paused), waiting: waits.length } });
     }
-    overviewKept.set(root, { at: Date.now(), key, value });
+    overviewKept.set(root, { at: Date.now(), key, value, tree, waits });
     return { ...value, ...day, ...latest };
 }
+/** One of what waits as the phone shows it, whole; a text of nothing but IDs, paths and links: said in general. */
+function waitingLine(tree, { item }) {
+    const on = item.on ? forPhone(humanTask(tree, item.on, tree.lang)) : "";
+    return { what: forPhone(humanTask(tree, item.what, tree.lang)) || ui(tree.lang, "ui.phone.waiting.item"), ...(on ? { on } : {}) };
+}
+/**
+ * More of what waits than the overview gives: `limit` of them (at most WAITING_ASKED) from `from`, of the same list the
+ * overview of the tree began (kept as long as it is), each text as cleaned for the phone; n: how many wait in all.
+ */
+export function treeWaiting(root, env, from, limit) {
+    treeOverview(root, env);
+    const kept = overviewKept.get(root);
+    if (!kept?.tree)
+        return { n: 0, items: [] };
+    const start = Math.max(0, Math.floor(from));
+    const tree = kept.tree;
+    return { n: kept.waits.length, items: kept.waits.slice(start, start + Math.min(WAITING_ASKED, Math.max(0, Math.floor(limit)))).map((w) => waitingLine(tree, w)) };
+}
 /** The last changes the research saved, newest first, as the bridge's /log gives them (each commit, its lines). */
 export function treeLog(root, env, limit = LOG_PHONE) {
     const h = head(root);
@@ -199,7 +218,7 @@ export function treeLog(root, env, limit = LOG_PHONE) {
         id: e.head.slice(0, 12),
         at: e.at,
         lines: lines.slice(0, LINES_PER_CHANGE),
-        ...(lines.length > LINES_PER_CHANGE ? { more: lines.length - LINES_PER_CHANGE } : {}),
+        ...(lines.length > LINES_PER_CHANGE ? { more: lines.length - LINES_PER_CHANGE, rest: lines.slice(LINES_PER_CHANGE, LINES_PER_CHANGE + LINES_KEPT) } : {}),
     }));
     const value = { changes, more: all.length > limit };
     logKept.set(root, { head: h, limit, value });

package/dist/core/tree.js

@@ -27,7 +27,7 @@ import { lastBackup } from "./backup.js";
 export const TREE_FILE = "strom.json";
 // between releases the candidate being made (a bridge run from the sources says what it is: the Strom app goes by it);
 // at a release the release's own (package.json)
-export const VERSION = "1.18.0-beta.5";
+export const VERSION = "1.18.0-beta.7";
 const GITIGNORE = `# Strom Research — local state and large files are not versioned
 .strom/
 /media/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strom-research",
-  "version": "1.18.0-beta.5",
+  "version": "1.18.0-beta.7",
   "description": "Genealogical research toolkit for AI coding agents",
   "type": "module",
   "bin": {