@monster-orange/den 0.4.2 → 0.4.4

package/src/ui/server/public/local-dev.html

@@ -1371,6 +1371,34 @@
       }
       .agent-form select {
         max-width: 320px;
+        min-width: 0;
+      }
+      .agent-form-help {
+        flex-basis: 100%;
+        margin: 0;
+        font-size: 12px;
+        color: var(--muted);
+        overflow-wrap: anywhere;
+      }
+      .agent-form-help[hidden],
+      .agent-form-ready[hidden] {
+        display: none;
+      }
+      /* AG-0.2: the runtime it will run, or why it can't (the mock's .helpl). */
+      .agent-form-ready {
+        flex-basis: 100%;
+        order: 1;
+        margin: 0;
+        font-size: 12px;
+        line-height: 1.4;
+        color: var(--faint);
+        overflow-wrap: anywhere;
+      }
+      .agent-form-ready[data-tone="warn"] {
+        color: var(--warn);
+      }
+      .agent-form-ready .mono {
+        font-family: var(--mono);
       }
       .agent-cwd {
         max-width: 280px;
@@ -1459,8 +1487,8 @@
           initChangelog,
           copyToClipboard,
           computePrimaryByRepo,
-          requireUnlock,
           setServiceRunner,
+          sudoRun,
           takePendingAction,
           problemCards,
           problemFix,
@@ -1517,13 +1545,12 @@
             .replace(/>/g, ">")
             .replace(/"/g, """);
 
-        // ── The lock (R8): the shell's lock chip and popover (topbar.js) ──────────
-        // requireSudo() is this page's lock rule, shared with every page: true
-        // when unlocked; otherwise the lock popover opens on its password
-        // field and the command doesn't run.
-        function requireSudo() {
-          return requireUnlock();
-        }
+        // ── The admin password (R8, LK-0) ─────────────────────────────────────────
+        // It is for sudo, and nothing else: no action here asks for it up
+        // front. A run whose command is about to run sudo without it gets a
+        // needs-sudo event from the server (sudoRun().see); the shell's
+        // prompt then says what needs it, and after the password the action
+        // runs again (sudoRun().done).
 
         // ── Bootstrap ─────────────────────────────────────────────────────────────
         // Systems with auto-start toggled OFF in the viewed workspace (`autostart:
@@ -1543,7 +1570,7 @@
           ]);
           initLogBadge();
           // Start and Restart from the status drawer and the ⌘K palette run
-          // here, with this page's lock rule and output (R15, R17).
+          // here, with this page's output (R15, R17).
           setServiceRunner((cmd, s) =>
             window.runCmd(s.address, s.repo, s.service, cmd),
           );
@@ -3021,10 +3048,10 @@
 
         // ── Workspace-level command (SSE) ─────────────────────────────────────────
         // Routes output to each service's own tab as `label` events arrive.
-        window.runWorkspaceSync = function () {
-          if (!requireSudo()) return;
+        window.runWorkspaceSync = async function () {
           setAllButtons(true);
           setWsStatus("syncing…");
+          const sudo = sudoRun();
           const es = new EventSource("/api/workspace/sync");
           // Clear previous sync output then open/activate the tab (explicit action).
           clearDismissed("⟳ sync");
@@ -3033,6 +3060,7 @@
           setBusy("⟳ sync", true);
           es.onmessage = (e) => {
             const msg = JSON.parse(e.data);
+            sudo.see(msg);
             if (msg.type === "line") appendToTab("⟳ sync", msg.text);
             if (msg.type === "error")
               appendToTab("⟳ sync", "Error: " + msg.text, "err");
@@ -3044,6 +3072,7 @@
               setTimeout(() => setWsStatus(""), 3000);
               // See refreshAfterSync — a sync that clones brings new commands with it.
               refreshAfterSync();
+              void sudo.done(() => window.runWorkspaceSync());
             }
           };
           es.onerror = () => {
@@ -3073,10 +3102,10 @@
         // rather than a shared pane, so it sits with everything else for that
         // system. Buttons are not globally disabled: it is one repo.
         const _syncing = new Set();
-        window.runRepoSync = function (repo) {
-          if (!requireSudo()) return;
+        window.runRepoSync = async function (repo) {
           if (_syncing.has(repo)) return; // already in flight — ignore re-entry
           _syncing.add(repo);
+          const sudo = sudoRun();
 
           const route = tabRouteFor(repo);
           clearDismissed(route); // explicit action — undo any prior dismissal
@@ -3101,12 +3130,14 @@
           );
           es.onmessage = (e) => {
             const msg = JSON.parse(e.data);
+            sudo.see(msg);
             if (msg.type === "line") appendToTab(route, msg.text);
             if (msg.type === "error")
               appendToTab(route, "Error: " + msg.text, "err");
             if (msg.type === "done") {
               es.close();
               finish("sync complete");
+              void sudo.done(() => window.runRepoSync(repo));
               // A pull can replace this repo's health probes on disk. The health
               // response is cached ~8s, so force a fresh poll rather than leaving
               // dots that reflect the code we just replaced.
@@ -3126,8 +3157,8 @@
           };
         };
 
-        window.runWorkspaceCmd = function (cmd, addresses) {
-          if (!requireSudo()) return;
+        window.runWorkspaceCmd = async function (cmd, addresses) {
+          const sudo = sudoRun();
           const only =
             Array.isArray(addresses) && addresses.length
               ? `&addresses=${encodeURIComponent(addresses.join(","))}`
@@ -3145,6 +3176,7 @@
 
           esWs.onmessage = (e) => {
             const msg = JSON.parse(e.data);
+            sudo.see(msg);
             if (msg.type === "label") {
               // New service section — route to the SYSTEM's primary tab (one tab
               // per system; sidecar output lands in its repo's tab with a header).
@@ -3210,6 +3242,7 @@
               idle();
               // Lifecycle changed run-state — sync dots now, don't wait for the poll.
               syncHealthNow();
+              void sudo.done(() => window.runWorkspaceCmd(cmd, addresses));
             }
           };
           esWs.onerror = () => {
@@ -3240,8 +3273,7 @@
         // is derived on the SERVER (see the `seed` param in /api/workspace/exec):
         // its rules are load-bearing, and the already-healthy skip it relies on is
         // suppressed whenever an explicit address list is sent.
-        window.runUpWithDeps = function (repo) {
-          if (!requireSudo()) return;
+        window.runUpWithDeps = async function (repo) {
           void runWorkspaceCmdAsync("up", null, {
             seed: repo,
             undismiss: true,
@@ -3252,16 +3284,14 @@
         // same closure as "up with deps", reversed. Derived server-side for the
         // same reason as its counterpart: the already-stopped skip is suppressed
         // when an explicit address list is sent.
-        window.runDownWithDeps = function (repo) {
-          if (!requireSudo()) return;
+        window.runDownWithDeps = async function (repo) {
           void runWorkspaceCmdAsync("down", null, {
             seed: repo,
             undismiss: true,
           });
         };
 
-        window.runCmd = function (address, repo, service, cmd) {
-          if (!requireSudo()) return;
+        window.runCmd = async function (address, repo, service, cmd) {
           // Explicit single-service action — undo any prior dismissal so its pane returns.
           clearDismissed(address);
           // up/restart/down go through the workspace-exec runner: it uses the full
@@ -3290,9 +3320,12 @@
           setTabStatus(address, { es: esCmd });
           const _cmdTab = _tabs.get(address);
           if (_cmdTab) _cmdTab.esKind = "exec";
+          const sudo = sudoRun();
+          const again = () => window.runCmd(address, repo, service, cmd);
 
           esCmd.onmessage = (e) => {
             const msg = JSON.parse(e.data);
+            sudo.see(msg);
             if (msg.type === "cmd") {
               appendToTab(address, msg.text, "cmd");
             } else if (msg.type === "started") {
@@ -3320,6 +3353,7 @@
                   "done-fail",
                 );
                 setTabStatus(address, { live: false, errored: true, es: null });
+                void sudo.done(again);
               }
             } else if (msg.type === "line") {
               appendToTab(address, msg.text, "");
@@ -3340,6 +3374,7 @@
                 );
               _tabs.get(address) && (_tabs.get(address).busy = false);
               setTabStatus(address, { live: false, errored: !ok, es: null });
+              void sudo.done(again);
             }
           };
           esCmd.onerror = () => {
@@ -3824,9 +3859,11 @@
             // address filter — the filter suppresses the already-healthy skip and
             // the auto-start-off handling that make "with deps" behave.
             if (opts.seed) params.set("seed", opts.seed);
+            const sudo = sudoRun();
             const es = new EventSource(`/api/workspace/exec?${params}`);
             es.onmessage = (e) => {
               const msg = JSON.parse(e.data);
+              sudo.see(msg);
               if (msg.type === "label") {
                 currentAddress = msg.text;
                 // Route to the system's primary tab; skip dismissed panes on
@@ -3895,7 +3932,10 @@
                 idle();
                 // Lifecycle changed run-state — sync dots now, don't wait for the poll.
                 syncHealthNow();
-                resolve(ok);
+                // LK-0: after the admin password, the same run again.
+                void sudo
+                  .done(() => runWorkspaceCmdAsync(cmd, addresses, opts))
+                  .then((again) => resolve(again ?? ok));
               }
             };
             es.onerror = () => {

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

@@ -333,6 +333,7 @@
           initChangelog,
           computePrimaryByRepo,
           envReady,
+          sudoRun,
         } from "/header.js";
         import { ownersLabel } from "/workspace-picker.js";
 
@@ -613,10 +614,16 @@
             const usableCmds = isSub
               ? s.commands.filter((cmd) => !LIFECYCLE_CMDS.has(cmd))
               : s.commands;
+            // The workspace the row was built from (the first in view that
+            // defines it, focus first): its command runs there, not in
+            // whichever workspace is focused.
+            const wsAttr = s.inWorkspaces?.[0]
+              ? ` data-workspace="${esc(s.inWorkspaces[0])}"`
+              : "";
             const cmdButtons = usableCmds
               .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 logsButton = s.logs
@@ -743,8 +750,9 @@
           // Attach click handlers
           pane.querySelectorAll(".cmd-btn").forEach((btn) => {
             btn.addEventListener("click", () => {
-              const { repo, service, cmd, type } = btn.dataset;
-              if (type === "exec") runExec(repo, service, cmd, btn);
+              const { repo, service, cmd, type, workspace } = btn.dataset;
+              if (type === "exec")
+                runExec(repo, service, cmd, btn, workspace);
               else runLogs(repo, service, btn);
             });
           });
@@ -765,7 +773,7 @@
           }
         }
 
-        function runExec(repo, service, cmd, btn) {
+        function runExec(repo, service, cmd, btn, workspace) {
           endStream();
           const env = document.getElementById("env-sel").value;
 
@@ -781,8 +789,13 @@
           appendLine(`\n▶ ${repo}/${service} · ${cmd} · ${env}\n`, "cmd");
 
           const params = new URLSearchParams({ repo, service, cmd, env });
+          if (workspace) params.set("workspace", workspace);
           es = new EventSource(`/api/service/exec?${params}`);
-          handleSSE(es, repo, service);
+          // LK-0: a command that needs sudo without the password asks,
+          // then runs again.
+          handleSSE(es, repo, service, {
+            again: () => runExec(repo, service, cmd, btn, workspace),
+          });
         }
 
         function runLogs(repo, service, btn) {
@@ -819,8 +832,10 @@
           const isStream = opts.stream === true;
           const id = runId;
           const appendLine = (text, cls) => runs().append(id, text, cls);
+          const sudo = sudoRun();
           evtSrc.onmessage = (e) => {
             const msg = JSON.parse(e.data);
+            sudo.see(msg);
             if (msg.type === "cmd") {
               appendLine(msg.text, "cmd");
             } else if (msg.type === "line") {
@@ -842,6 +857,7 @@
               } else runs().set(id, { running: false });
               evtSrc.close();
               es = null;
+              if (opts.again) void sudo.done(opts.again);
             }
           };
           evtSrc.onerror = () => {

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

@@ -300,7 +300,8 @@ export async function mountSettings(deps) {
     const did = `d-${id}`;
     const v = value(r);
     const t = r.control?.type || "readonly";
-    const ro = !r.write;
+    // A custom control draws (and saves) itself: no write to read it by.
+    const ro = !r.write && t !== "custom";
     const single = ["number", "select", "toggle", "text"].includes(t);
     const label = single
       ? `<label class="l" id="${lid}" for="${cid}">${esc(r.label)}</label>`
@@ -499,7 +500,7 @@ export async function mountSettings(deps) {
       }, 2000);
   }
   function wireRow(r) {
-    if (!r.write) return;
+    if (!r.write && r.control?.type !== "custom") return;
     const row = $(`setting-${slug(r.id)}`);
     if (!row) return;
     const t = r.control?.type;

package/src/ui/server/public/settings-registry.js

@@ -64,6 +64,13 @@ export const DEN_SETTING_CATEGORIES = [
     description:
       "Settings for one workspace. They follow the Workspace you view in the top bar.",
   },
+  {
+    id: "agents",
+    label: "Agents",
+    order: 55,
+    description:
+      "The runtimes agents run on, installed first. Paths you set are this machine's only: everywhere (config/local/user.yml) or for one workspace (config/local/workspaces.yml), which wins.",
+  },
   {
     id: "cli",
     label: "Command line",
@@ -416,6 +423,29 @@ export const DEN_SETTINGS = [
     write: (v, ctx) => ctx.saveWorkspace({ editor: v || null }),
   },
 
+  // ── Agents ─────────────────────────────────────────────────────────────
+  {
+    id: "agents.runtimes",
+    category: "agents",
+    label: "Runtimes",
+    description:
+      "Each runtime's status and version, the path in use and where it came from. Set path… runs its version command first and refuses a path that isn't that runtime.",
+    keywords: [
+      "runtime",
+      "claude",
+      "codex",
+      "gemini",
+      "grok",
+      "path",
+      "bin",
+      "cli",
+      "agent",
+    ],
+    scope: "user",
+    control: { type: "custom", render: renderRuntimes },
+    read: () => null,
+  },
+
   // ── Command line ───────────────────────────────────────────────────────
   {
     id: "cli.local_dev",
@@ -472,7 +502,7 @@ export const DEN_SETTINGS = [
     category: "cli",
     label: "Browser sign-in",
     description:
-      "Signing in is needed only when this server is reached beyond this machine (the edge, or a LAN address); on localhost nothing asks for it. __DEN_CLI__ web login prints a sign-in link; __DEN_CLI__ web sessions lists signed-in browsers.",
+      "Signing in is needed only when this server is reached from another machine (through the edge, or a LAN address); on localhost, and through the edge from this machine, nothing asks for it. __DEN_CLI__ web login prints a sign-in link; __DEN_CLI__ web sessions lists signed-in browsers.",
     keywords: ["sign in", "sign out", "login", "logout", "session", "browser"],
     scope: "user",
     control: {
@@ -498,6 +528,53 @@ export const DEN_SETTINGS = [
     },
     read: () => null,
   },
+  {
+    // R8, LK-0: the admin password is for sudo, and nothing else. Den asks
+    // for it only when a command it runs needs sudo; here is whether it is
+    // saved, and Forget. Reading never wakes the vault.
+    id: "cli.sudo",
+    category: "cli",
+    label: "Admin password",
+    description:
+      "Used only when a command Den runs needs sudo, and asked for only then. It is no sign-in: nothing else needs it.",
+    keywords: ["admin", "password", "sudo", "forget", "vault", "1password"],
+    scope: "user",
+    control: {
+      type: "custom",
+      render(host, ctx) {
+        const draw = (st) => {
+          const saved = st?.saved;
+          const where =
+            saved === "vault"
+              ? `Saved in ${st.vault?.label || "the vault"}`
+              : saved === "session"
+                ? "Saved for this session"
+                : "Not saved";
+          host.innerHTML =
+            '<output class="set-ro" id="set-sudo"></output>' +
+            (saved
+              ? ' <button type="button" class="btn" id="set-sudo-forget">Forget</button>'
+              : "");
+          host.querySelector("output").textContent = where;
+          host
+            .querySelector("#set-sudo-forget")
+            ?.addEventListener("click", () =>
+              ctx.shell
+                .api("POST", "/api/sudo-password/forget", {})
+                .then(load)
+                .catch(load),
+            );
+        };
+        const load = () =>
+          fetch("/api/sudo-password/status", { cache: "no-store" })
+            .then((r) => (r.ok ? r.json() : null))
+            .then(draw)
+            .catch(() => draw(null));
+        void load();
+      },
+    },
+    read: () => null,
+  },
 
   // ── Distribution (read-only) ───────────────────────────────────────────
   distRow(
@@ -547,6 +624,154 @@ export const DEN_SETTINGS = [
   ),
 ];
 
+// ── Settings › Agents › Runtimes (AG-0.5) ────────────────────────────────
+
+const escR = (s) =>
+  String(s ?? "").replace(
+    /[&<>"']/g,
+    (c) =>
+      ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[
+        c
+      ],
+  );
+
+/** Where a runtime's path came from, as the row says it. */
+export const RUNTIME_SOURCE = {
+  workspace: "workspace",
+  setting: "global",
+  "login-shell": "detected · login shell",
+  PATH: "detected · PATH",
+  "well-known": "detected · install directory",
+  "interactive-shell": "detected · interactive shell",
+};
+
+/** One runtime's row (r: GET /api/agents/runtimes' entry). */
+export function runtimeRowHtml(r, scopeWs) {
+  const id = escR(r.id);
+  const name =
+    `<b>${escR(r.label || r.id)}</b>` +
+    (r.vendor ? ` <span class="rt-v">${escR(r.vendor)}</span>` : "") +
+    (r.denTools === false
+      ? ` <span class="set-tag" data-den-tools="coming">Den tools: coming</span>`
+      : "");
+  const set = r.source === "workspace" || r.source === "setting";
+  const status = r.available
+    ? `<span class="rt-ok">✓ ${escR(r.version ? r.version : "installed")}</span>`
+    : `<span class="rt-bad">${escR(set ? r.why : "Not installed")}</span>`;
+  const where = r.path
+    ? `<span class="den-mono rt-p">${escR(r.path)}</span> <span class="set-tag" data-src="${escR(r.source || "")}">${escR(RUNTIME_SOURCE[r.source] || r.source || "")}</span>`
+    : set
+      ? `<span class="set-tag" data-src="${escR(r.source)}">${escR(RUNTIME_SOURCE[r.source])}</span>`
+      : "";
+  // A path set at the scope shown can be cleared from here.
+  const mine = scopeWs ? r.source === "workspace" : r.source === "setting";
+  return (
+    `<div class="rt" data-runtime="${id}" data-available="${r.available ? "true" : "false"}">` +
+    `<div class="rt-n">${name}</div>` +
+    `<div class="rt-s">${status}</div>` +
+    `<div class="rt-w">${where}</div>` +
+    `<div class="rt-a"><button type="button" class="btn sm" data-set-path="${id}">Set path…</button>` +
+    (mine
+      ? ` <button type="button" class="btn sm" data-clear-path="${id}">Clear</button>`
+      : "") +
+    `</div>` +
+    `<form class="rt-f" data-path-form="${id}" hidden>` +
+    `<label class="rt-fl" for="rt-in-${id}">Path to ${escR(r.label || r.id)}${scopeWs ? ` for ${escR(scopeWs)}` : " (every workspace)"}</label>` +
+    `<input type="text" id="rt-in-${id}" class="den-mono" spellcheck="false" autocomplete="off" placeholder="/absolute/path/to/${escR(r.id === "den-claude" ? "claude" : r.id)}" value="${escR(mine ? r.path || "" : "")}">` +
+    `<button type="submit" class="btn sm primary">Save</button> <button type="button" class="btn sm" data-cancel-path>Cancel</button>` +
+    `<div class="rt-err" role="alert" hidden></div></form>` +
+    `</div>`
+  );
+}
+
+/** The Runtimes row: the list, a workspace selector, Set path… and Clear. */
+function renderRuntimes(host, ctx) {
+  const wss = ctx.workspaces || [];
+  let ws = "";
+  const draw = (rows, note) => {
+    host.innerHTML =
+      `<div class="rt-scope"><label for="rt-ws">Paths for</label> <select id="rt-ws" data-focus-key="rt-ws">` +
+      `<option value="">every workspace (user.yml)</option>` +
+      wss
+        .map(
+          (w) =>
+            `<option value="${escR(w)}"${w === ws ? " selected" : ""}>${escR(w)} (workspaces.yml)</option>`,
+        )
+        .join("") +
+      `</select></div>` +
+      (note ? `<div class="set-note">${escR(note)}</div>` : "") +
+      `<div class="rt-list" role="list">${rows.map((r) => runtimeRowHtml(r, ws)).join("")}</div>`;
+  };
+  const load = () => {
+    // Under an invalid config the runtimes answer 422: say why, ask nothing.
+    if (ctx.shell?.configInvalid?.() === true)
+      return draw([], "Fix the config first: the runtimes are read from it.");
+    return ctx.shell
+      .api(
+        "GET",
+        `/api/agents/runtimes${ws ? `?workspace=${encodeURIComponent(ws)}` : ""}`,
+      )
+      .then((b) =>
+        // Only what has a CLI to find: generic is the persona's argv.
+        draw((b?.runtimes || []).filter((r) => r.setting)),
+      )
+      .catch((e) => draw([], e?.message || "The runtimes did not load."));
+  };
+  host.addEventListener("change", (e) => {
+    if (e.target.id !== "rt-ws") return;
+    ws = e.target.value;
+    void load();
+  });
+  host.addEventListener("click", async (e) => {
+    const b = e.target.closest("button");
+    if (!b) return;
+    const row = b.closest(".rt");
+    const form = row?.querySelector(".rt-f");
+    if (b.dataset.setPath && form) {
+      form.hidden = false;
+      form.querySelector("input").focus();
+    } else if (b.hasAttribute("data-cancel-path") && form) {
+      form.hidden = true;
+    } else if (b.dataset.clearPath) {
+      await savePath(b.dataset.clearPath, null, form);
+    }
+  });
+  host.addEventListener("submit", async (e) => {
+    e.preventDefault();
+    const form = e.target.closest(".rt-f");
+    if (!form) return;
+    const bin = form.querySelector("input").value.trim();
+    if (!bin) return;
+    await savePath(form.dataset.pathForm, bin, form);
+  });
+  async function savePath(id, bin, form) {
+    const err = form?.querySelector(".rt-err");
+    const btns = form ? [...form.querySelectorAll("button")] : [];
+    btns.forEach((x) => (x.disabled = true));
+    try {
+      await ctx.shell.api(
+        "POST",
+        `/api/agents/runtimes/${encodeURIComponent(id)}/path`,
+        {
+          scope: ws ? "workspace" : "global",
+          ...(ws ? { workspace: ws } : {}),
+          bin,
+        },
+      );
+      await load();
+    } catch (x) {
+      // Its refusal is shown here, under the field, not as a toast.
+      if (err) {
+        err.textContent = x?.message || "Not saved";
+        err.hidden = false;
+      }
+    } finally {
+      btns.forEach((x) => (x.disabled = false));
+    }
+  }
+  void load();
+}
+
 /** Register Den's categories and rows with the shell's SETTINGS registry. */
 export function registerDenSettings(shell) {
   for (const c of DEN_SETTING_CATEGORIES) shell.registerSettingsCategory(c);