@monster-orange/den 0.4.22 → 0.4.24

package/src/ui/server/public/svc-panel.js

@@ -67,6 +67,9 @@ const S = {
   testing: new Set(),
   /** The open panel: { id, el, opener, scrim, timer }. */
   open: null,
+  /** D27: a pointer is down inside the panel: repaint after it is up. */
+  pressed: false,
+  syncLater: false,
 };
 
 /** Start or Restart from here: "starting…" until health says, or the timeout. */
@@ -228,14 +231,21 @@ function testsHtml(s) {
   return `<span class="den-svp-${ok ? "ok" : "bad"}">${esc(t(ok ? "svp.testsOk" : "svp.testsBad", { t: at }))}</span>`;
 }
 
-/** A Visit button (the rail row's ↗, or the panel's primary). */
+/**
+ * Visit: a real link, styled as a button (D27). A native target=_blank link
+ * is never popup-blocked (Safari blocked window.open from the delegated
+ * click) and works with no script. Off (down, starting): no href,
+ * aria-disabled, and a click says why (visit()).
+ */
 export function visitHtml(s, cls, label) {
   if (!s.url) return "";
-  const on = visitable(s);
+  const on = visitable(s) && /^https?:\/\//i.test(s.url);
   return (
-    `<button type="button" class="${cls}" data-visit="${esc(s.id)}" data-url="${esc(s.url)}"` +
-    ` aria-label="${esc(t("act.visitX", { s: s.id }))}" title="${esc(on ? s.url : t("svp.notRunning"))}"` +
-    `${on ? "" : ' aria-disabled="true"'}>${label}</button>`
+    `<a class="${cls}" data-visit="${esc(s.id)}" data-url="${esc(s.url)}"` +
+    (on
+      ? ` href="${esc(s.url)}" target="_blank" rel="noopener noreferrer"`
+      : ` role="link" tabindex="0" aria-disabled="true"`) +
+    ` aria-label="${esc(t("act.visitX", { s: s.id }))}" title="${esc(on ? s.url : t("svp.notRunning"))}">${label}</a>`
   );
 }
 
@@ -335,6 +345,12 @@ function sync() {
   publishUrls();
   const o = S.open;
   if (!o) return;
+  // D27: never repaint under a press: the button pressed would be replaced
+  // between pointerdown and click, and the click would land on the panel.
+  if (S.pressed) {
+    S.syncLater = true;
+    return;
+  }
   const a = document.activeElement;
   const mine = a && o.el.contains(a) && a !== o.el;
   const key = mine
@@ -451,15 +467,20 @@ export function panelOpen() {
 const env = () => S.deps.currentEnv?.() ?? "local";
 const runs = () => window.denShell?.runs;
 
-/** Visit: the service's URL in a new tab, or why not. */
+/**
+ * Visit, clicked: a live link opens by itself (the browser follows it, so
+ * true: leave the click alone); an off one says why (false: the caller
+ * prevents the click).
+ */
 export function visit(btn) {
-  if (btn.getAttribute("aria-disabled") === "true") {
+  if (
+    btn.getAttribute("aria-disabled") === "true" ||
+    !btn.hasAttribute("href")
+  ) {
     window.denShell?.toast?.(t("svp.notRunning"));
-    return;
+    return false;
   }
-  const url = btn.dataset.url;
-  if (!url || !/^https?:\/\//i.test(url)) return;
-  window.open(url, "_blank", "noopener");
+  return true;
 }
 
 /** A stream into a runs-dock tab: Start, Stop, Restart (exec), Logs, tests. */
@@ -635,6 +656,27 @@ export function initServicePanel(deps = {}) {
     sync();
   });
   window.addEventListener("den:pins", () => sync());
+  // D27: a press inside the open panel holds its repaint until it ends.
+  document.addEventListener(
+    "pointerdown",
+    (e) => {
+      if (S.open?.el.contains(e.target)) S.pressed = true;
+    },
+    true,
+  );
+  const released = () => {
+    if (!S.pressed) return;
+    S.pressed = false;
+    // After the click this press makes, then the repaint it held.
+    setTimeout(() => {
+      if (S.syncLater) {
+        S.syncLater = false;
+        sync();
+      }
+    }, 0);
+  };
+  document.addEventListener("pointerup", released, true);
+  document.addEventListener("pointercancel", released, true);
   document.addEventListener(
     "click",
     (e) => {
@@ -643,10 +685,7 @@ export function initServicePanel(deps = {}) {
       // The panel's Visit here; the rail's ↗ is shell.js's (the same visit()).
       const v = tgt.closest?.("[data-visit]");
       if (v) {
-        if (o?.el.contains(v)) {
-          e.preventDefault();
-          visit(v);
-        }
+        if (o?.el.contains(v) && !visit(v)) e.preventDefault();
         return;
       }
       const opener = tgt.closest?.("[data-svpanel-open]");

package/src/ui/server/route-classes.ts

@@ -374,6 +374,25 @@ export const ROUTES: readonly RouteEntry[] = [
     "forgets every stopped agent of the workspaces named (AG-14.1b)",
   ),
   M(["POST"], "/api/agents/restore", "Undo: brings removed agents back"),
+  M(
+    ["POST"],
+    "/api/workspaces/:ws/agents/:id/keep",
+    "D28 Keep this conversation: resets its rotation count (and, asked, sets its override to never); a person's only",
+  ),
+  S(
+    ["POST"],
+    "/api/workspaces/:ws/agents/:id/handoff",
+    "D28 Write handoff: types the handoff prompt into the agent's running session",
+  ),
+  R(
+    "/api/agents/rotation",
+    "D28: rotation settings, the overrides and an agent's effective values",
+  ),
+  M(
+    ["PUT"],
+    "/api/agents/rotation",
+    "D28: sets or clears one rotation setting at one scope; a person's only",
+  ),
   S(
     ["POST"],
     "/api/workspaces/:ws/agents/:id/fresh",
@@ -504,6 +523,8 @@ export const REGEX_ROUTES: Readonly<Record<string, readonly string[]>> = {
     "/api/workspaces/:ws/agents/:id/name",
     "/api/workspaces/:ws/agents/:id/paths",
     "/api/workspaces/:ws/agents/:id/persona",
+    "/api/workspaces/:ws/agents/:id/keep",
+    "/api/workspaces/:ws/agents/:id/handoff",
   ],
   "agent-routes.ts:RUNTIME_PATH": ["/api/agents/runtimes/:id/path"],
   "agent-routes.ts:PERSONA_PATH": ["/api/personas/:id"],

package/src/ui/server/session-routes.ts

@@ -50,7 +50,11 @@ import { revokedAgentIds } from "../../shared/actor-token.js";
 import { listRecords } from "../../shared/agents/records.js";
 import { softNewlineSeq } from "../../shared/agents/catalog.js";
 import { getRuntime } from "../../shared/agents/runtimes.js";
-import type { RotationInfo } from "../../shared/agents/rotation.js";
+import type {
+  RotationEntry,
+  RotationInfo,
+  RotationPolicy,
+} from "../../shared/agents/rotation.js";
 import {
   connectHost,
   noHost,
@@ -61,7 +65,7 @@ import { sessionPaths } from "../../shared/sessions/paths.js";
 import { loadPty, type PtyLoad } from "../../shared/sessions/pty.js";
 import type { SessionInfo } from "../../shared/sessions/types.js";
 import { agentRows, newerOf, noteEnded } from "../cli/agent-ops.js";
-import type { Override } from "../../shared/agents/records.js";
+import type { AgentRecord, Override } from "../../shared/agents/records.js";
 import { state as sessionState } from "../cli/sessions-command.js";
 import { recordAction } from "./audit.js";
 import { sendJson } from "./http-helpers.js";
@@ -85,6 +89,8 @@ export interface SessionRouteDeps {
   pty?: () => PtyLoad;
   /** The agent ids with an approval waiting for the person (AG-6a, ON-3). */
   waitingAgents?: () => ReadonlySet<string>;
+  /** D28: each agent's effective rotation settings (one resolver per list). */
+  rotationPolicy?: () => (rec: AgentRecord) => RotationPolicy | undefined;
 }
 
 interface Resolved {
@@ -95,6 +101,7 @@ interface Resolved {
   workspaceExists: (ws: string) => boolean;
   pty: () => PtyLoad;
   waitingAgents: () => ReadonlySet<string>;
+  rotationPolicy?: SessionRouteDeps["rotationPolicy"];
 }
 
 /** A workspace name as `?ws=` may give it. */
@@ -125,6 +132,7 @@ function resolve(d: SessionRouteDeps = {}): Resolved {
         )),
     pty: d.pty ?? (() => loadPty()),
     waitingAgents: d.waitingAgents ?? (() => new Set<string>()),
+    ...(d.rotationPolicy ? { rotationPolicy: d.rotationPolicy } : {}),
   };
 }
 
@@ -199,13 +207,16 @@ export interface ListedSession {
    * Relaunch from handoff is its action, not Resume.
    */
   rotation?: RotationInfo;
+  /** D28: the last relaunch from a handoff (the page toasts one Den did by itself). */
+  lastRotation?: RotationEntry;
 }
 
 /** The list, from the host's sessions and the agent records. */
 export function listedSessions(
   sessions: SessionInfo[],
   d: Pick<Resolved, "stateDir" | "dist" | "activeWorkspaces"> &
-    Partial<Pick<Resolved, "waitingAgents">>,
+    Partial<Pick<Resolved, "waitingAgents">> &
+    Pick<SessionRouteDeps, "rotationPolicy">,
   /** A workspace asked for by name (`?ws=`), listed even when inactive. */
   also?: string,
 ): ListedSession[] {
@@ -226,7 +237,12 @@ export function listedSessions(
   const out: ListedSession[] = [];
   const agentSessions = new Set<string>();
   noteEnded(d.stateDir(), mine, records);
-  for (const r of agentRows(mine, records, d.stateDir())) {
+  for (const r of agentRows(
+    mine,
+    records,
+    d.stateDir(),
+    d.rotationPolicy?.(),
+  )) {
     const rec = records.find((x) => x.id === r.agent)!;
     const s = r.session;
     if (s) agentSessions.add(s.ref.id);
@@ -262,7 +278,9 @@ export function listedSessions(
       ...(r.stoppedAt ? { stoppedAt: r.stoppedAt } : {}),
       ...(r.endedAt ? { endedAt: r.endedAt } : {}),
       ...(r.interruptedAt ? { interruptedAt: r.interruptedAt } : {}),
-      ...(r.rotation?.due ? { rotation: r.rotation } : {}),
+      // D28: always (its effective settings show), due or not.
+      ...(r.rotation ? { rotation: r.rotation } : {}),
+      ...(r.lastRotation ? { lastRotation: r.lastRotation } : {}),
       ...(revoked.has(rec.id) && s && !s.exited ? { tokenRevoked: true } : {}),
       ...(waiting.has(rec.id) && s && !s.exited ? { waiting: true } : {}),
     });

package/src/ui/server/ui-assets.ts

@@ -52,6 +52,8 @@ export const UI_MODULES: readonly string[] = [
   "/server-agent-page.js",
   // 0.4.18: the service panel (rail pins, Graph ⋯, Services names).
   "/svc-panel.js",
+  // D30: the shared searchable picker (Settings › Agents › Rotation).
+  "/combobox.js",
   // 0.4.18: where a service's live log comes from (Logs page and panel).
   "/log-source.js",
 ];