@monster-orange/den 0.4.22 → 0.4.24

package/src/ui/server/public/combobox.js

@@ -0,0 +1,150 @@
+/**
+ * A searchable picker (D30): a text field (role=combobox) over a listbox.
+ * Type to filter (the command palette's ranking, rankCommands), ↑/↓ to
+ * move, Enter (or a click) picks, Esc closes. What is picked is an id; what
+ * is shown is its name. One shared control, so a form never asks a person
+ * to type an id.
+ *
+ *   comboHtml({ id, label, placeholder })   the markup (a <label>, the
+ *                                            field, its list)
+ *   wireCombo(root, id, { items, onPick })  makes it work; items() is read
+ *                                            each time it opens, so it
+ *                                            follows live data. Returns
+ *                                            { value(), set(id), clear() }.
+ *
+ * An item: { id, label, sub?, keywords?, off? } (off: shown, not pickable).
+ */
+import { rankCommands } from "./topbar.js";
+
+const esc = (s) =>
+  String(s ?? "").replace(
+    /[&<>"']/g,
+    (c) =>
+      ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[
+        c
+      ],
+  );
+
+export function comboHtml({ id, label, placeholder = "" }) {
+  return (
+    `<span class="den-combo" data-combo="${esc(id)}">` +
+    `<label for="${esc(id)}">${esc(label)}</label>` +
+    `<span class="den-combo-box">` +
+    `<input type="text" id="${esc(id)}" role="combobox" aria-expanded="false" aria-controls="${esc(id)}-list" aria-autocomplete="list" autocomplete="off" spellcheck="false" placeholder="${esc(placeholder)}">` +
+    `<ul id="${esc(id)}-list" role="listbox" aria-label="${esc(label)}" class="den-combo-list" hidden></ul>` +
+    `</span></span>`
+  );
+}
+
+/** Rows ranked for `q` (every item when it is empty). */
+export function comboMatches(items, q) {
+  const list = items.map((x) => ({
+    ...x,
+    keywords: [x.id, x.sub ?? "", ...(x.keywords ?? [])],
+  }));
+  return rankCommands(list, q, { limit: 50, emptyLimit: 50 });
+}
+
+export function wireCombo(root, id, { items, onPick }) {
+  const input = root.querySelector(`#${CSS.escape(id)}`);
+  const ul = root.querySelector(`#${CSS.escape(id)}-list`);
+  if (!input || !ul) return null;
+  let picked = "";
+  let shown = [];
+  let sel = 0;
+  const close = () => {
+    ul.hidden = true;
+    input.setAttribute("aria-expanded", "false");
+    input.removeAttribute("aria-activedescendant");
+  };
+  const draw = () => {
+    shown = comboMatches(
+      items(),
+      input.value === labelOf(picked) ? "" : input.value,
+    );
+    sel = Math.min(sel, Math.max(0, shown.length - 1));
+    ul.innerHTML = shown.length
+      ? shown
+          .map(
+            (x, i) =>
+              `<li role="option" id="${esc(id)}-o-${i}" data-i="${i}" aria-selected="${i === sel}"${x.off ? ' aria-disabled="true"' : ""}>` +
+              `<span class="den-combo-l">${esc(x.label)}</span>` +
+              (x.sub ? `<span class="den-combo-s">${esc(x.sub)}</span>` : "") +
+              `</li>`,
+          )
+          .join("")
+      : `<li class="den-combo-none" aria-disabled="true">No match</li>`;
+    ul.hidden = false;
+    input.setAttribute("aria-expanded", "true");
+    if (shown.length)
+      input.setAttribute("aria-activedescendant", `${id}-o-${sel}`);
+    ul.querySelector(`[data-i="${sel}"]`)?.scrollIntoView?.({
+      block: "nearest",
+    });
+  };
+  const labelOf = (v) => items().find((x) => x.id === v)?.label ?? "";
+  const pick = (x) => {
+    if (!x || x.off) return;
+    picked = x.id;
+    input.value = x.label;
+    input.dataset.value = x.id;
+    close();
+    onPick?.(x);
+  };
+  input.addEventListener("focus", () => {
+    sel = 0;
+    draw();
+  });
+  input.addEventListener("input", () => {
+    picked = "";
+    delete input.dataset.value;
+    sel = 0;
+    draw();
+  });
+  input.addEventListener("keydown", (e) => {
+    if (e.key === "ArrowDown" || e.key === "ArrowUp") {
+      e.preventDefault();
+      if (ul.hidden) return draw();
+      const n = shown.length;
+      if (!n) return;
+      sel = (sel + (e.key === "ArrowDown" ? 1 : n - 1)) % n;
+      draw();
+    } else if (e.key === "Enter") {
+      if (ul.hidden) return;
+      e.preventDefault();
+      pick(shown[sel]);
+    } else if (e.key === "Escape") {
+      if (!ul.hidden) {
+        e.preventDefault();
+        e.stopPropagation();
+        close();
+      }
+    }
+  });
+  // mousedown, not click: the field keeps its focus (no blur close first).
+  ul.addEventListener("mousedown", (e) => {
+    const li = e.target.closest?.("[data-i]");
+    if (!li) return;
+    e.preventDefault();
+    pick(shown[Number(li.dataset.i)]);
+  });
+  input.addEventListener("blur", () => {
+    close();
+    // Leaving with a half-typed name: back to what was picked.
+    if (input.value !== labelOf(picked)) input.value = labelOf(picked);
+  });
+  return {
+    value: () => picked,
+    set: (v) => {
+      picked = v;
+      input.value = labelOf(v);
+      if (v) input.dataset.value = v;
+      else delete input.dataset.value;
+    },
+    clear: () => {
+      picked = "";
+      input.value = "";
+      delete input.dataset.value;
+    },
+  };
+}

package/src/ui/server/public/error-page.js

@@ -305,10 +305,15 @@ function githubBlock(s, t) {
 
 /**
  * D17: a Den with no owner yet that a rule lets someone claim. It leads the
- * page: Connect your GitHub account. "This is my computer" (with
- * web.allowed_github_org) goes to localhost and back, which only works in a
- * browser on the machine Den runs on, then starts the GitHub sign-in with
- * that proof; "Sign in as @login" (web.owner_github) works from anywhere.
+ * page: Connect your GitHub account.
+ *
+ *   - "Sign in as @login" (web.owner_github) works from any browser: when
+ *     it is there, it is the primary button.
+ *   - The localhost trip (web.allowed_github_org) only works in a browser
+ *     on the machine Den runs on, so its button says so ("On <host>
+ *     itself: connect GitHub"), never a footnote (D29).
+ *   - Only the org rule: the page says to open it on <host>, or to set
+ *     web.owner_github to sign in from anywhere.
  */
 function claimBlock(s, t) {
   const g = s.github;
@@ -316,24 +321,31 @@ function claimBlock(s, t) {
   const host = s.machine || "";
   const back = location.origin + location.pathname + location.search;
   const here = g.attest ? `${g.attest}?return=${encodeURIComponent(back)}` : "";
+  const as = g.ownerGithub
+    ? `<button type="button" class="btn primary" id="den-gh-start">${esc(t("err.signin.claimAs", { login: g.ownerGithub }))}</button>`
+    : "";
+  const hereBtn = here
+    ? `<a class="btn${as ? "" : " primary"}" id="den-claim-here" href="${esc(here)}">${
+        host
+          ? withHost(t, "err.signin.claimHereOn", { host })
+          : esc(t("err.signin.claimHere"))
+      }</a>`
+    : "";
   return (
     `<div id="den-gh" class="den-claim">` +
     `<h2 class="den-h" id="den-claim-title">${esc(t("err.signin.claimTitle"))}</h2>` +
     `<p class="lead" id="den-claim-lead">${esc(t("err.signin.claimLead", { name: s.name || "Den" }))}</p>` +
     (g.org
-      ? `<p id="den-claim-org">${withHost(t, "err.signin.claimOrg", { org: g.org, host })}</p>`
+      ? `<p id="den-claim-org">${withHost(
+          t,
+          g.ownerGithub ? "err.signin.claimOrg" : "err.signin.claimOrgOnly",
+          { org: g.org, host },
+        )}</p>`
       : "") +
     `<div class="acts" style="margin-top:0">` +
-    (here
-      ? `<a class="btn primary" id="den-claim-here" href="${esc(here)}">${esc(t("err.signin.claimHere"))}</a>`
-      : "") +
-    (g.ownerGithub
-      ? `<button type="button" class="btn${here ? "" : " primary"}" id="den-gh-start">${esc(t("err.signin.claimAs", { login: g.ownerGithub }))}</button>`
-      : "") +
+    as +
+    hereBtn +
     `</div><div id="den-gh-flow" aria-live="polite"></div>` +
-    (here
-      ? `<p class="den-gh-note" id="den-claim-note">${withHost(t, "err.signin.claimHereNote", { host })}</p>`
-      : "") +
     `</div>`
   );
 }

package/src/ui/server/public/i18n/es.js

@@ -311,9 +311,10 @@
     "err.signin.claimOrg":
       "Los miembros de la organización {org} de GitHub pueden reclamarlo, en un navegador en {host}.",
     "err.signin.claimHere": "Este es mi ordenador: conectar GitHub",
+    "err.signin.claimHereOn": "En {host}: conectar GitHub",
+    "err.signin.claimOrgOnly":
+      "Los miembros de la organización {org} de GitHub pueden reclamarlo desde un navegador en {host}. Abre esta página en {host}, o define web.owner_github para iniciar sesión desde cualquier sitio.",
     "err.signin.claimAs": "Iniciar sesión como @{login}",
-    "err.signin.claimHereNote":
-      "«Este es mi ordenador» solo funciona en un navegador en {host}. En otro sitio no abre nada.",
     "err.signin.claimChecking": "Comprobando que esto es {host}…",
     "err.signin.githubRefused":
       "@{login} no es el propietario de este {name}. Solo la cuenta del propietario puede usar Iniciar sesión con GitHub. Usa «Aprueba este ordenador» en su lugar.",
@@ -487,9 +488,50 @@
       "Su sesión rotó ({why}), pero no escribió handoff.md. Reanúdalo para que lo escriba, o empieza de cero.",
     "ag.rot.badHandoff":
       "Su sesión rotó ({why}), pero su handoff.md no está completo. Reanúdalo para arreglarlo, o empieza de cero.",
-    "ag.relaunch": "Relanzar desde el traspaso",
-    "ag.relaunchName": "Relanzar {id} desde el traspaso",
+    "ag.relaunch": "Relanzar ahora",
+    "ag.relaunchName": "Relanzar {id} ahora",
     "ag.relaunched": "{id} relanzado desde su traspaso",
+    "ag.rc.autoAsk":
+      "Toca rotar ({why}). Den le pide el traspaso cuando esté libre y luego lo relanza.",
+    "ag.rc.autoReady":
+      "Toca rotar ({why}). Su traspaso está listo: Den lo relanza cuando esté libre.",
+    "ag.rc.ready": "Toca rotar ({why}). Su traspaso está listo.",
+    "ag.rc.missing": "Toca rotar ({why}). Aún no tiene traspaso.",
+    "ag.rc.bad": "Toca rotar ({why}). Su traspaso no está completo.",
+    "ag.rc.fellBack":
+      "Toca rotar ({why}). No escribió el traspaso tras pedírselo 2 veces.",
+    "ag.rc.wanted":
+      "Toca rotar ({why}). Den lo relanza en cuanto escriba su traspaso.",
+    "ag.rc.write": "Escribir traspaso",
+    "ag.rc.writeName": "Pedir a {id} que escriba su traspaso",
+    "ag.rc.keep": "Mantener esta conversación",
+    "ag.rc.keepName": "Mantener la conversación de {id}",
+    "ag.rc.never": "No volver a preguntar para este agente",
+    "ag.rc.settings": "Ajustes",
+    "ag.rc.from":
+      "Rota tras {n} compactaciones ({src}); al tocar: {mode} ({src2})",
+    "ag.rc.fellBackBad":
+      "Toca rotar ({why}). Su traspaso sigue sin pasar la revisión tras pedírselo 2 veces.",
+    "ag.rc.from.one":
+      "Rota tras {n} compactación ({src}); al tocar: {mode} ({src2})",
+    "ag.rc.fromNever": "Nunca rota ({src}); al tocar: {mode} ({src2})",
+    "ag.rc.midTurn":
+      "{id} está a mitad de turno: pídelo de nuevo cuando termine",
+    "ag.rc.neverN": "nunca",
+    "ag.rc.mode.auto": "relanzar solo",
+    "ag.rc.mode.ask": "preguntar",
+    "ag.rc.mode.off": "nada",
+    "ag.rc.menu": "Ajustes de rotación",
+    "ag.rc.noState": "Aún no rota: cuenta desde su próximo inicio.",
+    "ag.rc.asked": "Se pidió a {id} su traspaso",
+    "ag.rc.askedRelaunch":
+      "Se pidió a {id} su traspaso. Den lo relanza en cuanto pase la revisión.",
+    "ag.rc.askedResumed":
+      "{id} reanudado para escribir su traspaso. Den lo relanza en cuanto pase la revisión.",
+    "ag.rc.kept": "Conversación de {id} mantenida: su cuenta vuelve a empezar",
+    "ag.rc.keptNever": "Conversación de {id} mantenida: ya no rotará",
+    "ag.rc.autoRelaunched":
+      "{id} relanzado desde su traspaso tras {why}. La conversación anterior {old} se conserva.",
     "ag.remove": "Quitar",
     "ag.removeName": "Quitar {id}",
     "ag.removed": "{id} quitado",
@@ -705,6 +747,7 @@
     "ver.pinned": "fijada {v}",
     "ver.usedLatest": "{n} ahora sigue la versión más reciente",
     "set.agents.personas": "Personas",
+    "set.agents.rotation": "Rotación",
     // The Agents tab (AG-4a-term, agents-page.js).
     "n.agents": "Agentes",
     "kind.agent": "Agente",

package/src/ui/server/public/i18n/ja.js

@@ -299,9 +299,10 @@
     "err.signin.claimOrg":
       "GitHub の {org} 組織のメンバーは、{host} 上のブラウザーでこれを登録できます。",
     "err.signin.claimHere": "これは自分のコンピューター: GitHub を接続",
+    "err.signin.claimHereOn": "{host} 上で: GitHub を接続",
+    "err.signin.claimOrgOnly":
+      "GitHub の {org} 組織のメンバーは、{host} 上のブラウザーからこれを登録できます。このページを {host} で開くか、どこからでもサインインできるよう web.owner_github を設定してください。",
     "err.signin.claimAs": "@{login} としてサインイン",
-    "err.signin.claimHereNote":
-      "「これは自分のコンピューター」は {host} 上のブラウザーでだけ使えます。ほかの場所では何も開きません。",
     "err.signin.claimChecking": "ここが {host} か確認しています…",
     "err.signin.githubRefused":
       "@{login} はこの {name} のオーナーではありません。GitHub でサインインを使えるのはオーナーのアカウントだけです。代わりに「このコンピューターを承認」を使ってください。",
@@ -473,9 +474,46 @@
       "セッションは交代しました（{why}）が、handoff.md がありません。再開して書かせるか、新しく始めてください。",
     "ag.rot.badHandoff":
       "セッションは交代しました（{why}）が、handoff.md が不完全です。再開して直すか、新しく始めてください。",
-    "ag.relaunch": "引き継ぎから再起動",
-    "ag.relaunchName": "{id} を引き継ぎから再起動",
+    "ag.relaunch": "今すぐ再起動",
+    "ag.relaunchName": "{id} を今すぐ再起動",
     "ag.relaunched": "{id} を引き継ぎから再起動しました",
+    "ag.rc.autoAsk":
+      "交代の時期です（{why}）。待機中になったら Den が引き継ぎを書かせ、再起動します。",
+    "ag.rc.autoReady":
+      "交代の時期です（{why}）。引き継ぎは準備済み: 待機中になったら Den が再起動します。",
+    "ag.rc.ready": "交代の時期です（{why}）。引き継ぎは準備済みです。",
+    "ag.rc.missing": "交代の時期です（{why}）。引き継ぎがまだありません。",
+    "ag.rc.bad": "交代の時期です（{why}）。引き継ぎが不完全です。",
+    "ag.rc.fellBack":
+      "交代の時期です（{why}）。2 回頼んでも引き継ぎを書きませんでした。",
+    "ag.rc.wanted":
+      "交代の時期です（{why}）。引き継ぎが書かれたら Den が再起動します。",
+    "ag.rc.write": "引き継ぎを書かせる",
+    "ag.rc.writeName": "{id} に引き継ぎを書かせる",
+    "ag.rc.keep": "この会話を続ける",
+    "ag.rc.keepName": "{id} の会話を続ける",
+    "ag.rc.never": "このエージェントには今後たずねない",
+    "ag.rc.settings": "設定",
+    "ag.rc.from": "圧縮 {n} 回で交代（{src}）。時期が来たら: {mode}（{src2}）",
+    "ag.rc.fellBackBad":
+      "交代の時期です（{why}）。2 回頼んでも引き継ぎが確認を通りません。",
+    "ag.rc.fromNever": "交代しません（{src}）。時期が来たら: {mode}（{src2}）",
+    "ag.rc.midTurn": "{id} は応答中です: ターンが終わってから頼んでください",
+    "ag.rc.neverN": "しない",
+    "ag.rc.mode.auto": "自動で再起動",
+    "ag.rc.mode.ask": "たずねる",
+    "ag.rc.mode.off": "何もしない",
+    "ag.rc.menu": "交代の設定",
+    "ag.rc.noState": "まだ交代の記録がありません: 次の起動から数えます。",
+    "ag.rc.asked": "{id} に引き継ぎを頼みました",
+    "ag.rc.askedRelaunch":
+      "{id} に引き継ぎを頼みました。確認が通ったら Den が再起動します。",
+    "ag.rc.askedResumed":
+      "引き継ぎを書かせるため {id} を再開しました。確認が通ったら Den が再起動します。",
+    "ag.rc.kept": "{id} の会話を続けます: 回数はやり直しです",
+    "ag.rc.keptNever": "{id} の会話を続けます: 今後は交代しません",
+    "ag.rc.autoRelaunched":
+      "{why}のあと {id} を引き継ぎから再起動しました。前の会話 {old} は残っています。",
     "ag.remove": "削除",
     "ag.removeName": "{id} を削除",
     "ag.removed": "{id} を削除しました",
@@ -691,6 +729,7 @@
     "ver.pinned": "{v} に固定",
     "ver.usedLatest": "{n} は最新バージョンに追従します",
     "set.agents.personas": "ペルソナ",
+    "set.agents.rotation": "交代",
     // The Agents tab (AG-4a-term, agents-page.js).
     "n.agents": "エージェント",
     "kind.agent": "エージェント",