@monster-orange/den 0.4.10 → 0.4.12

package/src/ui/server/public/term-input.js

@@ -0,0 +1,129 @@
+/**
+ * The Agents tab's terminal input and links (AG-4b), pure helpers for
+ * agents-page.js (and its tests):
+ *
+ *   isWebUrl(uri)          only http: and https: open (an OSC 8 link's
+ *                          javascript:, data:, file: and the rest never)
+ *   linkModifier(e, mac)   the click that opens a link: ⌘ on a Mac, Ctrl
+ *                          elsewhere; a plain click still selects
+ *   findPaths(line)        file paths in a line of output: `src/foo.ts:42`,
+ *                          `./a/b.js:3:7`, `/abs/path`; never a URL
+ *   editorUrl(ed, abs, l)  an editor's URL for a path and line (vscode,
+ *                          cursor, zed); none: null (the path is copied)
+ *   softNewlineKey(e)      Shift+Enter, and no other modifier
+ *   layoutKeyIndex(e)      ⌃⇧1 / ⌃⇧2 / ⌃⇧3 (by the key's code: Shift+1 is
+ *                          "!" on a US keyboard): 0-2, else -1. ⌘1-9 and
+ *                          Ctrl+1-9 are the browser's (its tabs), never ours
+ */
+
+/** The editors a path link opens in, by URL scheme (Settings › editor.open). */
+export const EDITORS = ["vscode", "cursor", "zed", "none"];
+
+/** Whether `uri` is an http or https URL: the only links that open. */
+export function isWebUrl(uri) {
+  if (typeof uri !== "string" || !uri) return false;
+  let u;
+  try {
+    u = new URL(uri);
+  } catch {
+    return false;
+  }
+  return (u.protocol === "http:" || u.protocol === "https:") && !!u.host;
+}
+
+/** This browser is on a Mac (⌘ opens links there, Ctrl elsewhere). */
+export function isMac(nav = globalThis.navigator) {
+  const p = nav?.userAgentData?.platform || nav?.platform || "";
+  return /mac|iphone|ipad/i.test(p);
+}
+
+/** The click opens a link: ⌘-click on a Mac, Ctrl-click elsewhere. */
+export function linkModifier(e, mac = isMac()) {
+  if (!e) return false;
+  return mac ? !!e.metaKey : !!e.ctrlKey;
+}
+
+/**
+ * A path, then an optional :line and :column. It never starts right after
+ * a word character, a dot, a slash or a colon, so no part of a URL
+ * (https://host/a/b) and no part of a longer word is one.
+ */
+const PATH_RE =
+  /(?<![\w./~:@%+-])((?:\.{1,2}\/|\/)?[\w@+-][\w.@+-]*(?:\/[\w.@+-]+)*)(?::(\d+)(?::(\d+))?)?/g;
+const EXT_RE = /[^/.]\.[A-Za-z0-9]{1,12}$/;
+
+/**
+ * The file paths in `line`: { text, start, end, path, line?, col? }, start
+ * and end its columns in the line (end exclusive). A path has a "/" and
+ * either starts with /, ./ or ../, has an extension or a line; or it is a
+ * file name with an extension and a line (`foo.ts:12`). The server says
+ * which of them exist in the agent's workspace (only those are links).
+ */
+export function findPaths(line) {
+  const out = [];
+  if (typeof line !== "string" || !line) return out;
+  PATH_RE.lastIndex = 0;
+  for (let m; (m = PATH_RE.exec(line)); ) {
+    let p = m[1];
+    const ln = m[2] === undefined ? undefined : Number(m[2]);
+    const col = m[3] === undefined ? undefined : Number(m[3]);
+    let text = m[0];
+    if (ln === undefined) {
+      // A sentence's full stop is not the path's.
+      const trimmed = p.replace(/\.+$/, "");
+      text = trimmed;
+      p = trimmed;
+    }
+    if (!p) continue;
+    const slash = p.includes("/");
+    const rooted = /^(?:\/|\.{1,2}\/)/.test(p);
+    const ext = EXT_RE.test(p);
+    const ok = slash
+      ? rooted || ext || ln !== undefined
+        ? !/^\d+\/\d+$/.test(p)
+        : false
+      : ext && ln !== undefined;
+    if (!ok) continue;
+    out.push({
+      text,
+      start: m.index,
+      end: m.index + text.length,
+      path: p,
+      ...(ln !== undefined ? { line: ln } : {}),
+      ...(col !== undefined ? { col } : {}),
+    });
+  }
+  return out;
+}
+
+/**
+ * The URL that opens `abs` at `line` (and `col`) in `editor`, or null:
+ * none, an editor Den doesn't know, or a path that isn't absolute.
+ */
+export function editorUrl(editor, abs, line, col) {
+  if (!["vscode", "cursor", "zed"].includes(editor)) return null;
+  if (typeof abs !== "string" || !abs.startsWith("/")) return null;
+  const p = abs.split("/").map(encodeURIComponent).join("/");
+  const at = line ? `:${line}${col ? `:${col}` : ""}` : "";
+  return `${editor}://file${p}${at}`;
+}
+
+/** Shift+Enter, no other modifier: the soft newline. */
+export function softNewlineKey(e) {
+  return (
+    e?.type === "keydown" &&
+    e.key === "Enter" &&
+    e.shiftKey &&
+    !e.ctrlKey &&
+    !e.altKey &&
+    !e.metaKey &&
+    !e.isComposing
+  );
+}
+
+/** ⌃⇧1, ⌃⇧2, ⌃⇧3: the layouts' index; else -1. */
+export function layoutKeyIndex(e) {
+  if (e?.type !== "keydown") return -1;
+  if (!e.ctrlKey || !e.shiftKey || e.metaKey || e.altKey) return -1;
+  return ["Digit1", "Digit2", "Digit3"].indexOf(e.code);
+}

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

@@ -877,14 +877,32 @@ function paletteItems() {
     });
   }
   for (const x of palSessions) {
-    const name = x.kind === "agent" ? (x.persona ?? x.label) : x.label;
+    // AG-4b: the name a person gave the agent, else its persona.
+    const base =
+      x.kind === "agent" ? x.displayName || (x.persona ?? x.label) : x.label;
+    // AG-4b: the session's name (a /rename, or Den's), when it says more.
+    const sn = x.kind === "agent" ? (x.sessionName ?? "").trim() : "";
+    const extra =
+      sn && sn !== base && sn !== x.persona && sn !== x.label ? sn : "";
+    const name = extra ? `${base} · ${extra}` : base;
     items.push({
       key: `agent:${x.id}`,
       kind: "agent",
       label: t("ag.pal", { ws: x.workspace, name }),
-      sub: x.kind === "agent" && x.persona !== x.label ? x.label : undefined,
-      dot: x.state === "running" ? "" : "off",
-      keywords: [x.workspace, x.label, x.persona ?? "", "agents", "terminal"],
+      sub:
+        x.kind === "agent" && (x.displayName || x.persona !== x.label)
+          ? x.label
+          : undefined,
+      dot: x.waiting ? "warn" : x.state === "running" ? "" : "off",
+      keywords: [
+        x.workspace,
+        x.label,
+        x.persona ?? "",
+        x.displayName ?? "",
+        x.sessionName ?? "",
+        "agents",
+        "terminal",
+      ],
       run: () => go(`/agents?open=${encodeURIComponent(x.id)}`),
     });
   }

package/src/ui/server/public/workspace-picker.js

@@ -25,7 +25,9 @@ export const EN_FALLBACK = {
   "ws.viewTitle":
     "View: what every page shows ({ws}). A view filter only: it starts, stops and routes nothing.",
   "ws.viewTitleFocus":
-    "View: what every page shows ({ws}). A view filter only: it starts, stops and routes nothing, and the CLI default ({focus}) stays the target for commands.",
+    "View: what every page shows ({ws}). It starts, stops and routes nothing. CLI default: {focus}.",
+  "ws.pickTip":
+    "Picking a workspace here also makes it the CLI default, so __DEN_CLI__ commands run there.",
 };
 function enT(key, vars) {
   return String(EN_FALLBACK[key] ?? key).replace(/\{(\w+)\}/g, (m, k) =>
@@ -50,10 +52,10 @@ function focusName(data) {
 /**
  * The top bar's Workspace ▾ menu (R4, 0.3.0-dev.18), from the `/api/scope`
  * and `/api/workspaces` payloads. It is the view scope: what every page,
- * the health row and `status` show. Choosing an entry never moves the
- * focus (the default target for commands); the focused workspace is
- * marked, and `focusable` names the workspace in view when it is not the
- * focus, for the menu's separate "Set <ws> as focus" item.
+ * the health row and `status` show. Choosing a workspace also makes it the
+ * focus (the CLI default, Ward's decision in 0.4.11); "All active" leaves
+ * the focus where it is. The focused workspace is marked, and `focus`
+ * names it, so the caller can skip a choice that is already the focus.
  *
  * "All active" is offered with two or more active workspaces; with one,
  * it and that workspace are the same view.
@@ -85,12 +87,13 @@ export function buildScopeMenuModel(scope, data, t = enT) {
       label: n,
       checked: n === one,
       focused: n === focus,
+      title: t("ws.pickTip"),
     })),
   ];
   return {
     label: active.length === 0 ? t("ws.noneLabel") : (one ?? t("ws.all")),
     items,
-    focusable: one && one !== focus ? one : null,
+    focus: focus ?? null,
     title: t(focus ? "ws.viewTitleFocus" : "ws.viewTitle", {
       ws: inView.join(", ") || t("ws.noneLabel"),
       focus,

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

@@ -148,6 +148,10 @@ export const ROUTES: readonly RouteEntry[] = [
     "/api/agents/runtimes",
     "/api/workspaces/:ws/agents",
   ].map((p) => R(p)),
+  R(
+    "/api/workspaces/:ws/agents/:id/paths",
+    "which paths an agent printed exist in its workspace (stat only, AG-4b)",
+  ),
   R(
     "/api/sessions",
     "lists the sessions and agents (names and states, never their output)",
@@ -302,6 +306,11 @@ export const ROUTES: readonly RouteEntry[] = [
   M(["POST", "DELETE"], "/api/workspaces/services"),
   M(["POST"], "/api/workspaces/settings"),
   M(["POST"], "/api/workspaces/:ws/agents/:id/stop", "TERM to its session"),
+  M(
+    ["POST"],
+    "/api/workspaces/:ws/agents/:id/name",
+    "the name a person gave an agent (AG-4b); its id never changes",
+  ),
   M(
     ["POST"],
     "/api/workspaces/:ws/agents/:id/remove",
@@ -407,6 +416,8 @@ export const REGEX_ROUTES: Readonly<Record<string, readonly string[]>> = {
     "/api/workspaces/:ws/agents/:id/fresh",
     "/api/workspaces/:ws/agents/:id/relaunch",
     "/api/workspaces/:ws/agents/:id/remove",
+    "/api/workspaces/:ws/agents/:id/name",
+    "/api/workspaces/:ws/agents/:id/paths",
   ],
   "agent-routes.ts:RUNTIME_PATH": ["/api/agents/runtimes/:id/path"],
   "session-routes.ts:IO_PATH": ["/api/sessions/:id/io"],

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

@@ -43,6 +43,8 @@ import { getStateDir } from "../../shared/paths.js";
 import { product } from "../../shared/product.js";
 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 {
   connectHost,
@@ -132,6 +134,18 @@ export interface ListedSession {
   /** The `<name>` part: an agent's id, a plain session's name. */
   label: string;
   agent?: string;
+  /** The name a person gave the agent (AG-4b), when one did. */
+  displayName?: string;
+  /**
+   * Its session's name (AG-4b): the latest of Den's rename and the
+   * runtime's (Claude Code's /rename), when there is one.
+   */
+  sessionName?: string;
+  /**
+   * What Shift+Enter sends to it (AG-4b, its catalog entry's softNewline):
+   * ESC CR unless the runtime says otherwise. A plain session: none (Enter).
+   */
+  softNewline?: string;
   persona?: string;
   runtime?: string;
   model?: string;
@@ -193,6 +207,9 @@ export function listedSessions(
       kind: "agent",
       label: rec.id,
       agent: rec.id,
+      ...(rec.displayName ? { displayName: rec.displayName } : {}),
+      ...(r.sessionName ? { sessionName: r.sessionName } : {}),
+      softNewline: softNewlineSeq(getRuntime(rec.runtime)?.catalog),
       persona: rec.persona,
       runtime: rec.runtime,
       ...(rec.model ? { model: rec.model } : {}),

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

@@ -36,6 +36,8 @@ export const UI_MODULES: readonly string[] = [
   "/agents-page.js",
   // The Start agent form's choices, shared by both (AG-10.0).
   "/agent-start.js",
+  // AG-4b: the panes' keys and links (Shift+Enter, ⌃⇧1-3, paths).
+  "/term-input.js",
   // SEC-2a: Pair a device's QR code (a tiny encoder of Den's own).
   "/qr.js",
   // The UI's catalogs other than English (R19; en is in shell.js).
@@ -51,6 +53,9 @@ export const VENDOR_ASSETS: Readonly<Record<string, string>> = {
   "/vendor/xterm.mjs": "@xterm/xterm/lib/xterm.mjs",
   "/vendor/xterm.css": "@xterm/xterm/css/xterm.css",
   "/vendor/addon-fit.mjs": "@xterm/addon-fit/lib/addon-fit.mjs",
+  // AG-4b: plain URLs in a pane are links (⌘- or Ctrl-click opens them).
+  "/vendor/addon-web-links.mjs":
+    "@xterm/addon-web-links/lib/addon-web-links.mjs",
 };
 
 /** The installed file for a vendored URL path, or null. */