@monster-orange/den 0.4.2 → 0.4.4

package/src/ui/server/public/agents-section.js

@@ -7,15 +7,16 @@
  *
  * Every call is the server's agent routes (agent-routes.ts), which are the
  * CLI's own operations: nothing here keeps an agent's state. Each action
- * goes through denShell.api() (a refusal is its error toast) after the
- * lock rule (requireUnlock, R8), as a service action does. A row with a
+ * goes through denShell.api() (a refusal is its error toast). None asks
+ * for the admin password: it is for sudo, and no agent action runs sudo
+ * (LK-0). A row with a
  * session has Open (its terminal on the Agents page, AG-4a-term), and the
  * header links to the Agents page for the workspace.
  *
  * The page's table styles (table.svc, .tablewrap, .tbl-*) and the shell's
  * (.den-sec, .den-btn, .den-dot) are reused as they are.
  */
-import { requireUnlock } from "/topbar.js";
+import { fillStartForm } from "/agent-start.js";
 
 const t = (key, vars) => window.denShell?.t?.(key, vars) ?? key;
 const esc = (s) =>
@@ -62,6 +63,8 @@ export function agentsSectionHtml(ws) {
               <form class="agent-form" id="agent-start-form" hidden>
                 <label>${esc(t("ag.persona"))} <select class="form-sel" name="persona" required></select></label>
                 <label>${esc(t("ag.runtime"))} <select class="form-sel" name="runtime"></select></label>
+                <p class="agent-form-help" data-persona-help hidden></p>
+                <p class="agent-form-ready" data-runtime-ready role="status" hidden></p>
                 <button type="submit" class="den-btn sm primary" id="agent-start-go">${esc(t("ag.go"))}</button>
                 <button type="button" class="den-btn sm" data-agent-cancel>${esc(t("ag.cancel"))}</button>
               </form>
@@ -185,22 +188,7 @@ async function refresh(ws) {
 }
 
 function fillForm(form, data) {
-  const ps = form.querySelector('select[name="persona"]');
-  ps.innerHTML = (data.personas ?? [])
-    .map(
-      (p) =>
-        `<option value="${esc(p.id)}">${esc(p.id)}${p.role ? ` — ${esc(p.role)}` : ""}</option>`,
-    )
-    .join("");
-  const rs = form.querySelector('select[name="runtime"]');
-  rs.innerHTML =
-    `<option value="">${esc(t("ag.runtime.auto"))}</option>` +
-    (data.runtimes ?? [])
-      .map(
-        (r) =>
-          `<option value="${esc(r.id)}"${r.available ? "" : " disabled"}>${esc(r.id)}${r.available ? "" : ` — ${esc(t("ag.unavailable"))}`}</option>`,
-      )
-      .join("");
+  fillStartForm(form, data, t);
 }
 
 async function openForm(sec) {
@@ -229,7 +217,6 @@ async function openForm(sec) {
 }
 
 async function act(ws, verb, id, button) {
-  if (!requireUnlock()) return;
   button.disabled = true;
   try {
     await api("POST", `${base(ws)}/${encodeURIComponent(id)}/${verb}`);
@@ -243,7 +230,6 @@ async function act(ws, verb, id, button) {
 }
 
 async function start(ws, form) {
-  if (!requireUnlock()) return;
   const go = form.querySelector("#agent-start-go");
   const persona = form.querySelector('select[name="persona"]').value;
   const runtime = form.querySelector('select[name="runtime"]').value;

package/src/ui/server/public/agents.html

@@ -298,7 +298,17 @@
         font-size: 12.5px;
       }
       dialog.ag-dlg {
-        width: min(440px, calc(100vw - 32px));
+        /* The approved mock's Start agent dialog (AG-0.5), measured on
+           den-shell.html: .dlg.wide, min(600px, 100%) of content in a
+           content-box, so 600 + 2 x 18 padding + 2 x 1 border = 638
+           outside at 1440. Here the box is border-box: 638, and never
+           wider than the viewport less 16px a side (at 375 the mock's
+           box is 381 and overflows; this one is 343). */
+        box-sizing: border-box;
+        width: min(638px, calc(100vw - 32px));
+        max-width: none;
+        max-height: calc(100vh - 32px);
+        overflow-y: auto;
         background: var(--raised);
         color: var(--text);
         border: 1px solid var(--border-strong);
@@ -311,8 +321,41 @@
       }
       .ag-dlg form {
         display: grid;
+        /* AG-10.0: minmax(0, 1fr), so a long option can't widen the form
+           past the dialog and push Cancel and Start out of sight. */
+        grid-template-columns: minmax(0, 1fr);
         gap: 12px;
       }
+      .ag-dlg .help {
+        margin: -6px 0 0;
+        font: 12.5px/1.45 var(--sans);
+        color: var(--muted);
+        overflow-wrap: anywhere;
+      }
+      .ag-dlg .help[hidden],
+      .ag-dlg .ready[hidden],
+      .ag-dlg .err[hidden] {
+        display: none;
+      }
+      /* AG-0.2: the runtime it will run, or why it can't, before Start
+         (the mock's .helpl: 12px, faint, 1.4). */
+      .ag-dlg .ready {
+        margin: -6px 0 0;
+        font: 12px/1.4 var(--sans);
+        color: var(--faint);
+        overflow-wrap: anywhere;
+      }
+      .ag-dlg .ready[data-tone="warn"] {
+        color: var(--warn);
+      }
+      .ag-dlg .ready .mono {
+        font-family: var(--mono);
+      }
+      .ag-dlg .err {
+        margin: 0;
+        font: 12.5px/1.45 var(--sans);
+        color: var(--bad);
+      }
       .ag-dlg h2 {
         margin: 0;
         font: 600 17px var(--display);
@@ -325,7 +368,10 @@
         text-transform: uppercase;
         letter-spacing: 0.07em;
       }
+      .ag-dlg input[type="password"],
       .ag-dlg select {
+        width: 100%;
+        min-width: 0;
         font: 13px var(--sans);
         text-transform: none;
         letter-spacing: 0;
@@ -404,10 +450,18 @@
             ><span id="ag-p-t">Persona</span>
             <select name="persona" id="ag-persona" required></select
           ></label>
+          <p class="help" id="ag-p-help" data-persona-help hidden></p>
           <label
             ><span id="ag-r-t">Runtime</span>
             <select name="runtime" id="ag-runtime"></select
           ></label>
+          <p
+            class="ready"
+            id="ag-r-ready"
+            data-runtime-ready
+            role="status"
+            hidden
+          ></p>
           <div class="btns">
             <button type="button" class="den-btn" id="ag-cancel">Cancel</button>
             <button type="submit" class="den-btn primary" id="ag-go">

package/src/ui/server/public/graph-model.js

@@ -156,6 +156,7 @@ export function applyHealth(m, results) {
       check: h.check ?? null,
       error: h.error ?? null,
       status: h.status ?? null,
+      redirect: h.redirect ?? null,
       ms:
         typeof h.ms === "number"
           ? h.ms
@@ -232,6 +233,7 @@ export function repoRollup(m, repo) {
       service: s.name,
       ok: s.health.ok,
       isEntrypoint: s.entry,
+      redirect: !!s.health.redirect,
     })),
   );
 }

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

@@ -30,12 +30,11 @@ const escT = (key, vars) =>
   );
 
 export {
-  isUnlocked,
-  onLockChange,
+  askSudo,
   problemCards,
   problemFix,
-  requireUnlock,
   setServiceRunner,
+  sudoRun,
   takePendingAction,
 } from "./topbar.js";
 export { buildRow } from "./health-fit.js";

package/src/ui/server/public/health-rollup.js

@@ -27,9 +27,9 @@
 export const STATE_RANK = { down: 0, degraded: 1, ok: 2, unknown: 3 };
 
 /**
- * @typedef {{ service: string, ok: boolean | null | undefined, isEntrypoint?: boolean, awaiting?: boolean }} HealthSignal
+ * @typedef {{ service: string, ok: boolean | null | undefined, isEntrypoint?: boolean, awaiting?: boolean, redirect?: boolean }} HealthSignal
  * @typedef {"down" | "degraded" | "ok" | "unknown"} RepoState
- * @typedef {{ state: RepoState, entry: string | null, down: string[], checked: number, unchecked: number, awaiting: number }} RepoRollup
+ * @typedef {{ state: RepoState, entry: string | null, down: string[], checked: number, unchecked: number, awaiting: number, redirected?: number }} RepoRollup
  */
 
 /**
@@ -60,6 +60,11 @@ export function rollupRepo(repo, signals) {
   const answered = signals.filter((s) => !s.awaiting);
   const entry = entrySignal(repo, answered);
   const checked = answered.filter((s) => s.ok === true || s.ok === false);
+  // A redirect (ok null, `redirect`) answered: not down, not up, and not
+  // "not checked" either; counted on its own.
+  const redirected = answered.filter(
+    (s) => s.redirect && s.ok !== true && s.ok !== false,
+  ).length;
   const down = awaiting
     ? []
     : checked.filter((s) => s.ok === false).map((s) => s.service);
@@ -77,8 +82,9 @@ export function rollupRepo(repo, signals) {
     entry: entry ? entry.service : null,
     down,
     checked: checked.length,
-    unchecked: answered.length - checked.length,
+    unchecked: answered.length - checked.length - redirected,
     awaiting,
+    ...(redirected ? { redirected } : {}),
   };
 }
 
@@ -99,16 +105,22 @@ export function rollupRows(rows) {
 
 /**
  * "down (web down)", "degraded (mailpit down)", "healthy",
- * "healthy, 25 not checked", "unknown (not checked)".
+ * "healthy, 25 not checked", "healthy, 1 redirect", "unknown (not
+ * checked)", "unknown (1 redirect)".
  * @param {RepoRollup} r
  * @returns {string}
  */
 export function describeRollup(r) {
-  const notChecked = r.unchecked > 0 ? `${r.unchecked} not checked` : "";
+  const extra = [
+    r.redirected ? `${r.redirected} redirect` : "",
+    r.unchecked > 0 ? `${r.unchecked} not checked` : "",
+  ]
+    .filter(Boolean)
+    .join(", ");
   if (r.awaiting) return "unknown (still checking)";
-  if (r.state === "unknown") return "unknown (not checked)";
-  if (r.state === "ok")
-    return notChecked ? `healthy, ${notChecked}` : "healthy";
+  if (r.state === "unknown")
+    return r.redirected ? `unknown (${extra})` : "unknown (not checked)";
+  if (r.state === "ok") return extra ? `healthy, ${extra}` : "healthy";
   return `${r.state} (${r.down.join(", ")} down)`;
 }
 

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

@@ -142,26 +142,21 @@
     "dock.err": "falló",
     "dock.last": "Última ejecución: {s} ↗",
     "dock.resize": "Arrastra para cambiar el tamaño",
-    "lock.locked": "Bloqueado",
-    "lock.unlocked": "Desbloqueado",
-    "lock.title":
-      "Desbloquea para iniciar, detener y reiniciar servicios y agentes",
-    "lock.nopw":
-      "sudo sin contraseña (NOPASSWD): no hace falta la contraseña de administrador",
-    "lock.session": "Desbloqueado durante esta sesión",
-    "lock.sessionDesc":
-      "Desbloqueado durante esta sesión: iniciar, detener y reiniciar funcionan en todas las páginas.",
+    "lock.waiting": "Se necesita la contraseña de administrador",
+    "lock.needs": "{cmd} necesita tu contraseña de administrador",
+    "lock.cmd": "Un comando",
     "lock.cfg":
       "Guardar la contraseña está desactivado: define secrets.provider y secrets.refs.sudo en {file}.",
     "lock.update": "Actualizar la contraseña guardada",
     "lock.saveTo": "Guardar en {s}",
     "lock.pw": "Contraseña de administrador",
-    "lock.go": "Desbloquear",
+    "lock.go": "Continuar",
     "lock.checking": "Comprobando…",
     "lock.note":
-      "Den la pide una vez por sesión. Los agentes no pueden desbloquear.",
-    "lock.again": "Escribir la contraseña de nuevo…",
-    "lock.saveFailed": "Desbloqueado, pero no se pudo guardar en {s}: {err}",
+      "Den la usa solo para sudo. Los agentes no pueden introducirla.",
+    "lock.saved": "Contraseña de administrador guardada para esta sesión",
+    "lock.saveFailed":
+      "Guardada para esta sesión, pero no se pudo guardar en {s}: {err}",
     "lock.wrong": "Contraseña incorrecta; inténtalo de nuevo",
     "lock.reqFailed": "La solicitud falló: ¿está en marcha el servidor?",
     "v.title": "Ver el registro de cambios",
@@ -289,11 +284,13 @@
     "set.graph.density": "Tarjetas",
     "set.graph.panelWidth": "Panel de detalles",
     "set.workspace.editor": "IDE de este espacio de trabajo",
+    "set.agents.runtimes": "Runtimes",
     "set.cli.local_dev": "Entorno local",
     "set.cli.cli_tabs": "Pestañas de terminal",
     "set.cli.log_window_lines": "Líneas del panel de registros",
     "set.cli.web_port": "Tu puerto web",
     "set.cli.signin": "Inicio de sesión del navegador",
+    "set.cli.sudo": "Contraseña de administrador",
     "set.distribution.brand": "Nombre del producto",
     "set.distribution.github_org": "Org de GitHub",
     "set.distribution.orgs": "Etiquetas de org",
@@ -330,6 +327,7 @@
     "ag.persona": "Persona",
     "ag.runtime": "Runtime",
     "ag.runtime.auto": "La de la persona",
+    "ag.runtime.default": "{name} (la de la persona)",
     "ag.unavailable": "no disponible",
     "ag.go": "Iniciar",
     "ag.starting": "Iniciando…",
@@ -372,5 +370,20 @@
     "ag.palStart": "Iniciar agente…",
     "ag.cap":
       "Hasta 4 paneles: se cerró el de {id} para hacer sitio (sigue en marcha)",
+    "ag.rt.ready": "Inicia {name} {version} desde",
+    "ag.rt.readyNoVer": "Inicia {name} desde",
+    "ag.rt.notFound": "No se encontró {name}.",
+    "ag.rt.searched": "Se buscó en:",
+    "ag.rt.more": "y {n} más",
+    "ag.rt.nowhere": "ningún directorio",
+    "ag.rt.refused": "{name} no puede iniciarse: {why}.",
+    "ag.rt.fix":
+      "Instálalo, o pon su ruta en {key} en {file}, o ejecuta {cmd}.",
+    "ag.rt.unknown": "Aquí no hay ningún runtime {id}.",
+    "ag.rt.denTools": "Herramientas de Den: próximamente",
+    "ag.rt.ownCli":
+      "Se ejecuta como su propia CLI en el workspace: las herramientas y los modos de permiso de Den llegarán más adelante.",
+    "ag.rt.notInstalled": "no instalado",
+    "ag.rt.needsArgv": "la persona no tiene plantilla argv",
   };
 })((window.denMessages = window.denMessages || {}));

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

@@ -131,27 +131,21 @@
     "dock.err": "失敗",
     "dock.last": "前回の実行: {s} ↗",
     "dock.resize": "ドラッグしてサイズを変更",
-    "lock.locked": "ロック中",
-    "lock.unlocked": "ロック解除",
-    "lock.title":
-      "ロックを解除するとサービスとエージェントの起動・停止・再起動ができます",
-    "lock.nopw":
-      "パスワード不要の sudo (NOPASSWD): 管理者パスワードは必要ありません",
-    "lock.session": "このセッションの間ロックを解除しました",
-    "lock.sessionDesc":
-      "このセッションの間ロック解除中: どのページでも起動・停止・再起動ができます。",
+    "lock.waiting": "管理者パスワードが必要です",
+    "lock.needs": "{cmd} に管理者パスワードが必要です",
+    "lock.cmd": "コマンド",
     "lock.cfg":
       "パスワードの保存はオフです: {file} で secrets.provider と secrets.refs.sudo を設定してください。",
     "lock.update": "保存したパスワードを更新",
     "lock.saveTo": "{s} に保存",
     "lock.pw": "管理者パスワード",
-    "lock.go": "ロック解除",
+    "lock.go": "続行",
     "lock.checking": "確認中…",
     "lock.note":
-      "Den が尋ねるのはセッションごとに一度です。エージェントはロックを解除できません。",
-    "lock.again": "パスワードをもう一度入力…",
+      "Den はこれを sudo にだけ使います。エージェントは入力できません。",
+    "lock.saved": "このセッションの間、管理者パスワードを保持します",
     "lock.saveFailed":
-      "ロックを解除しましたが、{s} への保存に失敗しました: {err}",
+      "このセッションの間は保持しますが、{s} への保存に失敗しました: {err}",
     "lock.wrong": "パスワードが違います。もう一度お試しください",
     "lock.reqFailed": "リクエストに失敗しました。サーバーは動いていますか?",
     "v.title": "変更履歴を見る",
@@ -278,11 +272,13 @@
     "set.graph.density": "カード",
     "set.graph.panelWidth": "詳細パネル",
     "set.workspace.editor": "このワークスペースの IDE",
+    "set.agents.runtimes": "ランタイム",
     "set.cli.local_dev": "ローカル環境",
     "set.cli.cli_tabs": "ターミナルのタブ",
     "set.cli.log_window_lines": "ログ欄の行数",
     "set.cli.web_port": "あなたの web ポート",
     "set.cli.signin": "ブラウザのサインイン",
+    "set.cli.sudo": "管理者パスワード",
     "set.distribution.brand": "製品名",
     "set.distribution.github_org": "GitHub の組織",
     "set.distribution.orgs": "組織のラベル",
@@ -318,6 +314,7 @@
     "ag.persona": "ペルソナ",
     "ag.runtime": "ランタイム",
     "ag.runtime.auto": "ペルソナの既定",
+    "ag.runtime.default": "{name}（ペルソナの既定）",
     "ag.unavailable": "利用不可",
     "ag.go": "開始",
     "ag.starting": "開始中…",
@@ -357,5 +354,20 @@
     "ag.palStart": "エージェントを開始…",
     "ag.cap":
       "ペインは最大 4 つです。{id} のペインを閉じました（実行は続きます）",
+    "ag.rt.ready": "{name} {version} を起動:",
+    "ag.rt.readyNoVer": "{name} を起動:",
+    "ag.rt.notFound": "{name} が見つかりません。",
+    "ag.rt.searched": "検索した場所:",
+    "ag.rt.more": "ほか {n} 件",
+    "ag.rt.nowhere": "なし",
+    "ag.rt.refused": "{name} を起動できません: {why}。",
+    "ag.rt.fix":
+      "インストールするか、{file} の {key} にパスを設定するか、{cmd} を実行してください。",
+    "ag.rt.unknown": "ランタイム {id} はここにありません。",
+    "ag.rt.denTools": "Den ツール: 近日対応",
+    "ag.rt.ownCli":
+      "ワークスペースで独自の CLI として動きます。Den のツールと権限モードは今後対応します。",
+    "ag.rt.notInstalled": "未インストール",
+    "ag.rt.needsArgv": "ペルソナに argv テンプレートがありません",
   };
 })((window.denMessages = window.denMessages || {}));

package/src/ui/server/public/index.html

@@ -1160,6 +1160,7 @@
         storeOpenLog,
         initChangelog,
         envReady,
+        sudoRun,
       } from "/header.js";
       import { ownersLabel } from "/workspace-picker.js";
       import {
@@ -2128,10 +2129,16 @@
 
         pane.innerHTML = services
           .map((s) => {
+            // The row's own workspace (the first in view that defines it):
+            // its command runs there, not in the focused one.
+            const ws = s.inWorkspaces?.[0];
+            const wsAttr = ws
+              ? ` data-workspace="${String(ws).replace(/[&<>"]/g, (c) => `&#${c.charCodeAt(0)};`)}"`
+              : "";
             const cmdBtns = s.commands
               .map(
                 (cmd) =>
-                  `<button class="cmd-btn" data-repo="${s.repo}" data-service="${s.service}" data-cmd="${cmd}" data-type="exec">${cmd}</button>`,
+                  `<button class="cmd-btn" data-repo="${s.repo}" data-service="${s.service}" data-cmd="${cmd}" data-type="exec"${wsAttr}>${cmd}</button>`,
               )
               .join("");
             const logsBtn = s.logs
@@ -2156,8 +2163,8 @@
 
         pane.querySelectorAll(".cmd-btn").forEach((btn) => {
           btn.addEventListener("click", () => {
-            const { repo, service, cmd, type } = btn.dataset;
-            if (type === "exec") runExec(repo, service, cmd);
+            const { repo, service, cmd, type, workspace } = btn.dataset;
+            if (type === "exec") runExec(repo, service, cmd, workspace);
             else {
               const env = document.getElementById("env-sel").value;
               storeOpenLog(repo, service, env);
@@ -2201,7 +2208,7 @@
       }
 
       // ── Service exec ──────────────────────────────────────────────────────────
-      function runExec(repo, service, cmd) {
+      function runExec(repo, service, cmd, workspace) {
         if (execEs) {
           execEs.close();
           execEs = null;
@@ -2234,9 +2241,14 @@
         );
 
         const params = new URLSearchParams({ repo, service, cmd, env });
+        if (workspace) params.set("workspace", workspace);
         execEs = new EventSource(`/api/service/exec?${params}`);
+        // LK-0: a command that needs sudo without the password asks, then
+        // runs again.
+        const sudo = sudoRun();
         execEs.onmessage = (e) => {
           const msg = JSON.parse(e.data);
+          sudo.see(msg);
           if (msg.type === "cmd") {
             cmdAppendLine(msg.text, "cmd");
             execDetachable = !!msg.detached;
@@ -2261,6 +2273,7 @@
               .forEach((b) => (b.disabled = false));
             execEs?.close();
             execEs = null;
+            void sudo.done(() => runExec(repo, service, cmd, workspace));
           }
         };
         execEs.onerror = () => {