@monster-orange/den 0.4.3 → 0.4.4

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",
@@ -383,5 +380,10 @@
     "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": "組織のラベル",
@@ -368,5 +364,10 @@
     "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 = () => {

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

@@ -1487,8 +1487,8 @@
           initChangelog,
           copyToClipboard,
           computePrimaryByRepo,
-          requireUnlock,
           setServiceRunner,
+          sudoRun,
           takePendingAction,
           problemCards,
           problemFix,
@@ -1545,14 +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
-        // (async): true when unlocked, after asking the server and the vault
-        // (LK-2, LK-3); 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:
@@ -1572,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),
           );
@@ -3051,9 +3049,9 @@
         // ── Workspace-level command (SSE) ─────────────────────────────────────────
         // Routes output to each service's own tab as `label` events arrive.
         window.runWorkspaceSync = async function () {
-          if (!(await requireSudo())) return;
           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");
@@ -3062,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");
@@ -3073,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 = () => {
@@ -3103,9 +3103,9 @@
         // system. Buttons are not globally disabled: it is one repo.
         const _syncing = new Set();
         window.runRepoSync = async function (repo) {
-          if (!(await requireSudo())) return;
           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
@@ -3130,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.
@@ -3156,7 +3158,7 @@
         };
 
         window.runWorkspaceCmd = async function (cmd, addresses) {
-          if (!(await requireSudo())) return;
+          const sudo = sudoRun();
           const only =
             Array.isArray(addresses) && addresses.length
               ? `&addresses=${encodeURIComponent(addresses.join(","))}`
@@ -3174,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).
@@ -3239,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 = () => {
@@ -3270,7 +3274,6 @@
         // its rules are load-bearing, and the already-healthy skip it relies on is
         // suppressed whenever an explicit address list is sent.
         window.runUpWithDeps = async function (repo) {
-          if (!(await requireSudo())) return;
           void runWorkspaceCmdAsync("up", null, {
             seed: repo,
             undismiss: true,
@@ -3282,7 +3285,6 @@
         // same reason as its counterpart: the already-stopped skip is suppressed
         // when an explicit address list is sent.
         window.runDownWithDeps = async function (repo) {
-          if (!(await requireSudo())) return;
           void runWorkspaceCmdAsync("down", null, {
             seed: repo,
             undismiss: true,
@@ -3290,7 +3292,6 @@
         };
 
         window.runCmd = async function (address, repo, service, cmd) {
-          if (!(await requireSudo())) return;
           // 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
@@ -3319,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") {
@@ -3349,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, "");
@@ -3369,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 = () => {
@@ -3853,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
@@ -3924,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;