@monster-orange/den 0.4.13 → 0.4.15

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

@@ -22,8 +22,8 @@ export interface PairRouteDeps {
   pairs: PairRequests;
   sendJson: (res: http.ServerResponse, body: unknown, status?: number) => void;
   readBody: (req: http.IncomingMessage) => Promise<string>;
-  /** A new browser session for this request (via "code"); its Set-Cookie line. */
-  signIn: (req: http.IncomingMessage) => string;
+  /** A new browser session for this request (via "code"): its Set-Cookie line and approval key. */
+  signIn: (req: http.IncomingMessage) => { cookie: string; approveKey: string };
   /** The client's address for a new request's record, when Den knows it. */
   client: (req: http.IncomingMessage) => string | undefined;
   /** The commands that approve `code`: on the server, and by ssh from the browser's machine. */
@@ -132,8 +132,11 @@ export async function handlePairRoutes(
         deps.sendJson(res, { ok: false, state: "gone" }, 404);
         return true;
       }
-      res.setHeader("Set-Cookie", deps.signIn(req));
-      deps.sendJson(res, { ok: true, state: "ok" });
+      const s = deps.signIn(req);
+      res.setHeader("Set-Cookie", s.cookie);
+      res.setHeader("Cache-Control", "no-store");
+      // The approval key goes to this answer only (web-session.ts).
+      deps.sendJson(res, { ok: true, state: "ok", approveKey: s.approveKey });
       return true;
     }
     deps.sendJson(res, {

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

@@ -1535,8 +1535,99 @@ const sd = {
   intent: "ask",
   extras: [],
   extrasOpen: false,
+  // AG-17.1, Bring in: null for Start; else the workspace's conversations,
+  // the runtimes that can't bring one in, and the one picked.
+  bring: null,
 };
 
+/** The conversation picked in Bring in, when it can be brought in. */
+function bringPick() {
+  const c = (sd.bring?.list ?? []).find((x) => x.id === sd.bring.pick);
+  return c && !c.open && !c.agent ? c : null;
+}
+
+/** "3 min ago", "2 h ago", or the date. */
+function agoText(iso) {
+  const ms = Date.now() - Date.parse(iso);
+  if (!Number.isFinite(ms)) return "";
+  const m = Math.round(ms / 60000);
+  if (m < 1) return t("ag.bring.now");
+  if (m < 60) return t("ag.bring.min", { n: m });
+  const h = Math.round(m / 60);
+  if (h < 48) return t("ag.bring.h", { n: h });
+  return iso.slice(0, 10);
+}
+
+/** The folder a conversation ran in, inside the workspace's when it is. */
+function convFolder(c) {
+  const root = sd.bring?.root;
+  if (root && c.cwd === root) return ".";
+  if (root && c.cwd.startsWith(`${root}/`)) return c.cwd.slice(root.length + 1);
+  return c.cwd;
+}
+
+function convRowHtml(c) {
+  const taken = c.agent
+    ? ` <span class="tagx">${esc(t("ag.bring.agent", { id: c.agent }))}</span>`
+    : c.open
+      ? ` <span class="tagx warn" title="${esc(t("ag.bring.openTip"))}">${esc(t("ag.bring.open"))}</span>`
+      : "";
+  const off = c.agent || c.open;
+  return (
+    `<button type="button" class="pr" role="radio" data-cid="${esc(c.id)}" aria-checked="${c.id === sd.bring.pick}"${off ? ' aria-disabled="true"' : ""}>` +
+    `<span class="rd" aria-hidden="true"></span><span class="pn pnc"><span class="pt">${esc(c.title || t("ag.bring.untitled"))}</span>${taken}</span><span class="mono">${esc(agoText(c.lastAt))}</span>` +
+    `<span class="pd mono">${esc(convFolder(c))} · ${esc(c.id.slice(0, 8))}</span></button>`
+  );
+}
+
+/** Bring in's conversation list and its help line. */
+function paintConversations() {
+  const f = $d("#ag-conv-f");
+  f.hidden = !sd.bring;
+  if (!sd.bring) return;
+  const list = sd.bring.list;
+  const cant = (sd.bring.runtimes ?? [])
+    .filter((r) => !r.bringIn && r.id !== "generic")
+    .map((r) => r.why);
+  $d("#ag-conv-h").textContent = [
+    list.length ? t("ag.bring.help") : t("ag.bring.none"),
+    // Each its own sentence (they read as one run-on line before).
+    ...cant.map((w) => (/[.!?]$/.test(w) ? w : `${w}.`)),
+  ].join(" ");
+  $d("#ag-conv").innerHTML = list.map(convRowHtml).join("");
+  $d("#ag-conv").hidden = !list.length;
+}
+
+/** Ask for the workspace's conversations (Bring in). */
+async function fillConversations(ws) {
+  if (!sd.bring) return true;
+  try {
+    const r = await api(
+      "GET",
+      `/api/workspaces/${encodeURIComponent(ws)}/conversations`,
+    );
+    sd.bring.list = r?.conversations ?? [];
+    sd.bring.runtimes = r?.runtimes ?? [];
+    sd.bring.root = r?.folder ?? "";
+  } catch (err) {
+    window.denShell?.errorToast?.(err);
+    return false;
+  }
+  if (!sd.bring.list.some((c) => c.id === sd.bring.pick))
+    sd.bring.pick = sd.bring.list.find((c) => !c.open && !c.agent)?.id ?? "";
+  paintConversations();
+  return true;
+}
+
+function pickConversation(id) {
+  const c = (sd.bring?.list ?? []).find((x) => x.id === id);
+  if (!c || c.open || c.agent) return;
+  sd.bring.pick = id;
+  for (const b of st.root.querySelectorAll("#ag-conv [data-cid]"))
+    b.setAttribute("aria-checked", String(b.dataset.cid === id));
+  paintRuntime(false);
+}
+
 const $d = (sel) => st.root.querySelector(sel);
 const curPersona = () =>
   sd.pid === PLAIN
@@ -1563,10 +1654,13 @@ function personaModel() {
 function plistHtml() {
   const ps = sd.data?.personas ?? [];
   const cats = sd.data?.categories ?? [];
+  const rows = personaListHtml(sd.f, ps, cats, (p) =>
+    personaRowHtml(p, p.id === sd.pid, sd.data),
+  );
+  // Bring in continues a conversation: it needs a persona.
+  if (sd.bring) return rows;
   return (
-    personaListHtml(sd.f, ps, cats, (p) =>
-      personaRowHtml(p, p.id === sd.pid, sd.data),
-    ) +
+    rows +
     `<div class="pgh"><span>${esc(t("ag.session"))}</span><span></span></div>` +
     `<button type="button" class="pr" role="radio" data-pid="${esc(PLAIN)}" aria-checked="${sd.pid === PLAIN}"><span class="rd" aria-hidden="true"></span><span class="pn">${esc(t("ag.new.plain"))}</span><span></span><span class="pd">${esc(t("ag.new.plainP"))}</span></button>`
   );
@@ -1608,13 +1702,30 @@ function paintDetails() {
  * and the dialog says so.
  */
 function paintRuntime(reset) {
+  paintRuntimeFields(reset);
+  // Last: a Name that names a running agent disables Start (AG-10.10b).
+  paintStartsAs();
+}
+
+function paintRuntimeFields(reset) {
   const rs = $d("#ag-runtime");
   const go = $d("#ag-go");
   const ready = $d("#ag-r-ready");
   const plain = sd.pid === PLAIN;
-  $d("#ag-r-l").hidden = plain;
-  $d("#ag-task-l").hidden = plain;
-  $d("#ag-adv").hidden = plain;
+  // Bring in: the conversation's runtime, its own history; no first
+  // instruction, no Advanced (it keeps what the persona gives).
+  $d("#ag-r-l").hidden = plain || !!sd.bring;
+  $d("#ag-task-l").hidden = plain || !!sd.bring;
+  $d("#ag-adv").hidden = plain || !!sd.bring;
+  $d("#ag-name-l").hidden = plain || !!sd.bring;
+  if (sd.bring) {
+    $d("#ag-r-miss").hidden = true;
+    ready.hidden = true;
+    const ok = !!bringPick() && !!curPersona();
+    go.disabled = !ok;
+    go.dataset.blocked = ok ? "" : "conversation";
+    return;
+  }
   const fb = $d("#ag-r-fb");
   fb.hidden = true;
   if (plain) {
@@ -1675,7 +1786,10 @@ function paintAdvanced() {
   const models = rtv?.models ?? [];
   const model = sd.model || def.model;
   const first = t("ag.new.modelDef", {
-    m: `${def.model || t("pe.rtDefault")} · ${versionLabel(def.model ? def.version : "latest")}`,
+    // No model of its own: just the version, so the label fits the select.
+    m: def.model
+      ? `${def.model} · ${versionLabel(def.version)}`
+      : versionLabel("latest"),
   });
   const verFirst = t("ag.new.verDef", {
     v: versionLabel(
@@ -1749,6 +1863,8 @@ async function fillForWorkspace(ws) {
     window.denShell?.errorToast?.(err);
     return false;
   }
+  if (!(await fillConversations(ws))) return false;
+  if (sd.bring && sd.pid === PLAIN) sd.pid = "";
   const ps = sd.data?.personas ?? [];
   if (sd.pid !== PLAIN && !ps.some((p) => p.id === sd.pid)) {
     // The first persona the list shows (grouped by category).
@@ -1765,9 +1881,19 @@ async function fillForWorkspace(ws) {
   return true;
 }
 
-async function openStart() {
+/** The dialog's words for Start, or for Bring in (AG-17.1). */
+function dialogMode(bring) {
+  sd.bring = bring ? { list: [], runtimes: [], root: "", pick: "" } : null;
+  $d("#ag-dlg-h").textContent = t(bring ? "ag.bring.title" : "ag.new.title");
+  $d("#ag-note").textContent = t(bring ? "ag.bring.note" : "ag.new.note");
+  $d("#ag-go").textContent = t(bring ? "ag.bring.go" : "ag.go");
+  $d("#ag-conv-f").hidden = !bring;
+}
+
+async function openStart(bring = false) {
   const dlg = $d("#ag-dlg");
   if (!dlg || dlg.open) return;
+  dialogMode(bring);
   const shown = viewWorkspaces();
   const wsSel = $d("#ag-ws");
   wsSel.innerHTML = shown
@@ -1812,21 +1938,127 @@ function startBody() {
   }
   const task = $d("#ag-task").value.trim();
   if (task) body.instruction = task;
+  const name = $d("#ag-name").value.trim();
+  if (name) body.name = name;
   return body;
 }
 
 function showStartError(err) {
   const el = $d("#ag-err");
   el.textContent = err?.message || String(err);
+  // AG-10.10: that agent is running: offer to open it.
+  const running = err?.data?.running;
+  if (running?.sessionId) {
+    const b = document.createElement("button");
+    b.type = "button";
+    b.className = "den-btn sm";
+    b.id = "ag-open-running";
+    b.textContent = t("ag.new.openRunning");
+    b.addEventListener("click", () => {
+      $d("#ag-dlg").close?.();
+      void openPane(running.sessionId);
+    });
+    el.append(" ", b);
+  }
   el.hidden = false;
 }
 
+/**
+ * AG-10.10b: the id a Name gives, as the server's nameSlug: lowercase,
+ * spaces to "-", only id characters, at most 64; null when none is left.
+ */
+export function nameSlug(name) {
+  const s = String(name)
+    .trim()
+    .toLowerCase()
+    .replace(/\s+/g, "-")
+    .replace(/[^a-z0-9._-]/g, "")
+    .replace(/-{2,}/g, "-")
+    .replace(/^[^a-z0-9]+/, "")
+    .slice(0, 64)
+    .replace(/[-._]+$/, "");
+  return s && /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/.test(s) ? s : null;
+}
+
+/**
+ * The id this start takes (AG-10.10, 10.10b), said as you type: a Name is
+ * the id as its slug. A running agent here with that id or title: "is
+ * already running · Open it", Start off. A stopped one: "Resume it", or
+ * Start takes the next suffix.
+ */
+function paintStartsAs() {
+  const el = $d("#ag-as");
+  if (!el) return;
+  const p = sd.pid && sd.pid !== PLAIN && !sd.bring ? curPersona() : null;
+  el.hidden = !p;
+  el.textContent = "";
+  if (!p) return;
+  const name = ($d("#ag-name")?.value ?? "").trim();
+  const slug = name ? nameSlug(name) : null;
+  const ws = $d("#ag-ws")?.value || viewWorkspaces()[0];
+  const here = (st.data?.sessions ?? []).filter(
+    (r) => r.kind === "agent" && r.workspace === ws,
+  );
+  const live = (r) => r.state === "running" || r.state === "stopping";
+  const match = name
+    ? (here.find(
+        (r) =>
+          live(r) &&
+          (r.agent === slug ||
+            (r.displayName ?? "").toLowerCase() === name.toLowerCase()),
+      ) ?? here.find((r) => r.agent === slug))
+    : null;
+  const act = (label, fn) => {
+    const b = document.createElement("button");
+    b.type = "button";
+    b.className = "den-btn sm";
+    b.textContent = label;
+    b.addEventListener("click", fn);
+    return b;
+  };
+  if (match && live(match)) {
+    el.append(
+      t("ag.new.isRunning", { id: match.agent }) + " · ",
+      act(t("ag.new.openIt"), () => {
+        $d("#ag-dlg").close?.();
+        void openPane(match.id);
+      }),
+    );
+    $d("#ag-go").disabled = true;
+    return;
+  }
+  if (match) {
+    el.append(
+      t("ag.new.isStopped", { id: match.agent }) + " · ",
+      act(t("ag.new.resumeIt"), () => {
+        $d("#ag-dlg").close?.();
+        void restartRow(match, "resume", null);
+      }),
+      " " + t("ag.new.orNext", { id: nextFree(slug) }),
+    );
+    return;
+  }
+  el.textContent = t("ag.new.as", {
+    id: slug ?? sd.data?.startsAs?.[p.id] ?? p.id,
+  });
+}
+
+/** The first `<slug>-<n>` no agent on this page has (the server decides). */
+function nextFree(slug) {
+  const ids = new Set((st.data?.sessions ?? []).map((r) => r.agent));
+  for (let n = 2; n < 1000; n++)
+    if (!ids.has(`${slug.slice(0, 58)}-${n}`))
+      return `${slug.slice(0, 58)}-${n}`;
+  return slug;
+}
+
 async function submitStart(form) {
   const dlg = $d("#ag-dlg");
   const go = $d("#ag-go");
   if (go.disabled) return;
   const ws = form.querySelector("#ag-ws").value || viewWorkspaces()[0];
   if (!ws || !sd.pid) return;
+  if (sd.bring) return submitBringIn(ws);
   const bad = sd.extras.find((c) => commandProblem(c));
   if (sd.pid !== PLAIN && bad)
     return showStartError(new Error(t("pe.badCmd", { c: bad })));
@@ -1852,6 +2084,9 @@ async function submitStart(form) {
       startBody(),
     );
     window.denShell?.toast?.(t("ag.started", { id: r?.agent?.id ?? sd.pid }));
+    // AG-10.10: the next start of this persona takes another id.
+    personasAsked.delete(ws);
+    $d("#ag-name").value = "";
     for (const w of r?.warnings ?? []) window.denShell?.toast?.(w);
     dlg.close?.();
     await refresh();
@@ -1865,6 +2100,36 @@ async function submitStart(form) {
   }
 }
 
+/** Bring in (AG-17.1): the runtime's resume of the conversation picked. */
+async function submitBringIn(ws) {
+  const dlg = $d("#ag-dlg");
+  const go = $d("#ag-go");
+  const c = bringPick();
+  const p = curPersona();
+  if (!c || !p) return;
+  go.disabled = true;
+  go.textContent = t("ag.bring.going");
+  try {
+    const r = await api(
+      "POST",
+      `/api/workspaces/${encodeURIComponent(ws)}/conversations/${encodeURIComponent(c.id)}/import`,
+      { persona: p.id, runtime: c.runtime },
+    );
+    window.denShell?.toast?.(t("ag.bring.done", { id: r?.agent?.id ?? p.id }));
+    for (const w of r?.warnings ?? []) window.denShell?.toast?.(w);
+    dlg.close?.();
+    await refresh();
+    if (r?.agent?.sessionId) await openPane(r.agent.sessionId);
+  } catch (err) {
+    showStartError(err);
+    // Still open elsewhere, or taken since: the list says so now.
+    await fillConversations(ws);
+  } finally {
+    go.textContent = t("ag.bring.go");
+    if (dlg.open) paintRuntime(false);
+  }
+}
+
 /** New persona, Edit or Duplicate from the dialog; back to it after. */
 async function editFromStart(kind) {
   const p = curPersona();
@@ -1892,6 +2157,12 @@ async function editFromStart(kind) {
 function wireStartDialog(root) {
   const form = root.querySelector("#ag-form");
   form.addEventListener("click", (e) => {
+    const cr = e.target.closest("#ag-conv [data-cid]");
+    if (cr) {
+      e.preventDefault();
+      pickConversation(cr.dataset.cid);
+      return;
+    }
     const pr = e.target.closest("#ag-persona [data-pid]");
     if (pr) {
       e.preventDefault();
@@ -1944,6 +2215,9 @@ function wireStartDialog(root) {
     if (e.target.id === "ag-q") {
       sd.f.q = e.target.value;
       paintPlist(false);
+    } else if (e.target.id === "ag-name") {
+      // AG-10.10b: what the Name gives, as you type.
+      paintRuntime(false);
     } else if (e.target.id === "ag-tools") {
       sd.extras = splitCommands(e.target.value);
       syncPermBlock(form, "ag", sd.data, {
@@ -2032,6 +2306,8 @@ function translateStatic(root) {
   };
   set("#ag-h", "n.agents");
   set("#ag-start", "ag.start");
+  set("#ag-bring", "ag.bring");
+  set("#ag-conv-t", "ag.bring.conv");
   set("#ag-clear", "ag.clear");
   set("#ag-dlg-h", "ag.new.title");
   set("#ag-ws-t", "ag.ws");
@@ -2041,6 +2317,7 @@ function translateStatic(root) {
   set("#ag-newp", "ag.new.newP");
   set("#ag-what-p", "pe.what");
   set("#ag-task-t", "ag.new.task");
+  set("#ag-name-t", "ag.new.name");
   set("#ag-adv-s", "ag.new.adv");
   set("#ag-note", "ag.new.note");
   const task = root.querySelector("#ag-task");
@@ -2129,6 +2406,9 @@ export async function mountAgentsPage(root) {
   root.querySelector("#ag-start").addEventListener("click", () => {
     void openStart();
   });
+  root.querySelector("#ag-bring")?.addEventListener("click", () => {
+    void openStart(true);
+  });
   root.querySelector("#ag-clear")?.addEventListener("click", (e) => {
     void clearStopped(e.currentTarget);
   });

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

@@ -642,6 +642,7 @@
           <button type="button" class="den-btn" id="ag-clear" hidden>
             Clear stopped
           </button>
+          <button type="button" class="den-btn" id="ag-bring">Bring in</button>
           <button type="button" class="den-btn primary" id="ag-start">
             + Start agent
           </button>
@@ -660,6 +661,18 @@
       <dialog class="ag-dlg pe-dlg" id="ag-dlg" aria-labelledby="ag-dlg-h">
         <form method="dialog" id="ag-form" novalidate>
           <h2 id="ag-dlg-h">Start an agent</h2>
+          <div class="fld" id="ag-conv-f" hidden>
+            <div class="fldh">
+              <span class="k" id="ag-conv-t">Conversation</span>
+            </div>
+            <p class="helpl" id="ag-conv-h"></p>
+            <div
+              class="plist"
+              id="ag-conv"
+              role="radiogroup"
+              aria-labelledby="ag-conv-t"
+            ></div>
+          </div>
           <div class="fld" id="ag-pfld">
             <div class="fldh">
               <span class="k" id="ag-p-t">Persona</span
@@ -712,6 +725,11 @@
             ><span id="ag-task-t">First instruction (optional)</span>
             <textarea id="ag-task" rows="4" maxlength="8000"></textarea>
           </label>
+          <label class="fld" id="ag-name-l"
+            ><span id="ag-name-t">Name (optional)</span>
+            <input id="ag-name" maxlength="40" autocomplete="off" />
+          </label>
+          <p class="helpl" id="ag-as" role="status"></p>
           <details id="ag-adv">
             <summary id="ag-adv-s">Advanced: model and permissions</summary>
             <div class="adv-body" id="ag-adv-b"></div>

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

@@ -139,7 +139,7 @@ function withCmd(text, cmd) {
 function withHost(t, key, vars) {
   const marks = {};
   const v = { ...vars };
-  for (const k of ["host", "target"])
+  for (const k of ["host", "target", "user"])
     if (k in v) {
       marks[k] = v[k];
       v[k] = `\u0001${k}\u0001`;
@@ -203,6 +203,20 @@ export function countdownText(ms) {
  * Where a signed-in page goes: the page that was asked for. On /signin,
  * its same-origin `next` (else `/`); anywhere else, the same URL.
  */
+/**
+ * 0.4.15: keep a sign-in's approval key (web-session.ts) in this origin's
+ * localStorage, where shell.js sends it from. It comes in the sign-in's
+ * own answer only.
+ */
+function keepApproveKey(b) {
+  if (!b || typeof b.approveKey !== "string") return;
+  try {
+    localStorage.setItem("den.approveKey", b.approveKey);
+  } catch {
+    /* storage blocked: this browser signs in again to approve */
+  }
+}
+
 export function landingAfterSignIn(loc) {
   if (loc.pathname !== "/signin") return loc.pathname + loc.search + loc.hash;
   const n = new URLSearchParams(loc.search).get("next") || "/";
@@ -263,6 +277,7 @@ function wireGithub(root, t, s) {
           return;
         }
         if (b.state === "ok") {
+          keepApproveKey(b);
           show(
             `<p class="lead" style="margin-top:12px">${esc(t("err.signin.githubDone"))}</p>`,
           );
@@ -351,6 +366,9 @@ function wirePair(root, t, s) {
   if (!box) return;
   const host = s.machine || "";
   const target = s.ssh?.target || "";
+  // SEC-2a-UX: the account to log in as, so the SSH app doesn't guess one.
+  const user = s.ssh?.user || "";
+  const login = user ? `${user}@${target}` : target;
   let poll = null;
   let tick = null;
   let gen = 0;
@@ -376,7 +394,7 @@ function wirePair(root, t, s) {
   const show = (b) => {
     const term =
       s.ssh?.name && target
-        ? `<a class="btn" id="den-pair-term" href="ssh://${esc(target)}">${esc(t("err.signin.openTerminal"))}</a>`
+        ? `<a class="btn" id="den-pair-term" href="ssh://${esc(login)}">${esc(t("err.signin.openTerminal"))}</a>`
         : "";
     box.innerHTML =
       `<ol class="den-steps">` +
@@ -389,7 +407,11 @@ function wirePair(root, t, s) {
       `<p>${withHost(t, "err.signin.noTerminal", { host })}</p>` +
       cmdLine("den-pair-ssh", b.ssh, t, term) +
       (term
-        ? `<p class="den-pair-note">${withHost(t, "err.signin.sshNote", { target })}</p>`
+        ? `<p class="den-pair-note" id="den-pair-note">${
+            user
+              ? withHost(t, "err.signin.sshUserNote", { host, user })
+              : withHost(t, "err.signin.sshNote", { target })
+          }</p>`
         : "");
     wireCopy(box, t);
   };
@@ -432,6 +454,7 @@ function wirePair(root, t, s) {
                 return;
               }
               if (p.state === "ok") {
+                keepApproveKey(p);
                 stop();
                 box.innerHTML = `<p class="lead" id="den-pair-in">${esc(t("err.signin.youreIn"))}</p>`;
                 location.replace(landingAfterSignIn(location));
@@ -524,6 +547,7 @@ function mountSignedOut(root, sh, d) {
         .then((b) => {
           go.disabled = false;
           if (b.ok) {
+            keepApproveKey(b);
             err.textContent = "";
             form.innerHTML = `<p class="lead" id="den-confirm-in">${esc(t("err.signin.youreIn"))}</p>`;
             location.replace(typeof b.next === "string" ? b.next : "/");

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

@@ -251,7 +251,7 @@ function _injectChangelogStyles() {
       padding: 5px 16px; border-radius: 5px; font-size: 12px;
       font-weight: 600; cursor: pointer;
     }
-    .cl-got-it:hover { opacity: .85; }
+    .cl-got-it:hover { filter: brightness(0.92); }
   `;
   document.head.appendChild(style);
 

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

@@ -271,6 +271,8 @@
     "err.signin.noTerminal":
       "¿No tienes una terminal en {host}? Desde este ordenador, ejecuta:",
     "err.signin.openTerminal": "Abrir Terminal",
+    "err.signin.sshUserNote":
+      "Inicia sesión con tu cuenta de {host} ({user}) y su contraseña, o con una clave SSH.",
     "err.signin.sshNote":
       "Abrir Terminal abre ssh://{target} en tu aplicación de terminal. Necesita acceso SSH a {target}.",
     "err.signin.whyTitle": "¿Por qué?",
@@ -456,6 +458,14 @@
     "ag.new.plainP":
       "Una terminal en la carpeta del espacio de trabajo. Sin agente.",
     "ag.new.task": "Primera instrucción (opcional)",
+    "ag.new.name": "Nombre (opcional)",
+    "ag.new.as": "Se inicia como {id}",
+    "ag.new.openRunning": "Abrir el que está en ejecución",
+    "ag.new.isRunning": "{id} ya está en ejecución",
+    "ag.new.openIt": "Abrirlo",
+    "ag.new.isStopped": "{id} está detenido",
+    "ag.new.resumeIt": "Reanudarlo",
+    "ag.new.orNext": "o Iniciar crea {id}",
     "ag.new.taskPh":
       "p. ej., Toma la historia del estado vacío. Sigue el diseño y añade una prueba.",
     "ag.new.adv": "Avanzado: modelo y permisos",
@@ -465,6 +475,48 @@
     "ag.new.modelDef": "Predeterminado de la persona ({m})",
     "ag.new.ver": "Versión",
     "ag.new.verDef": "Predeterminado de la persona ({v})",
+    // AG-17.1, Bring in.
+    "ag.bring": "Traer",
+    "ag.bring.title": "Traer una conversación",
+    "ag.bring.conv": "Conversación",
+    "ag.bring.help":
+      "Conversaciones iniciadas fuera de Den en la carpeta de este espacio de trabajo o en las de sus repositorios, la más reciente primero.",
+    "ag.bring.none":
+      "No hay conversaciones iniciadas fuera de Den en la carpeta de este espacio de trabajo ni en las de sus repositorios.",
+    "ag.bring.untitled": "Conversación sin título",
+    "ag.bring.open": "Abierta en otro lugar",
+    "ag.bring.openTip": "Sigue abierta en otra terminal. Ciérrala allí primero",
+    "ag.bring.agent": "Agente {id}",
+    "ag.bring.note":
+      "La continúa en la carpeta donde se ejecutó, con las herramientas y protecciones de Den desde ahora. Sigue en ejecución si cierras el panel. Ciérrala antes en cualquier otro terminal: Den solo la ve abierta si se escribió en el último minuto.",
+    "ag.bring.go": "Traer",
+    "ag.bring.going": "Trayendo…",
+    "ag.bring.done": "Traída como {id}",
+    "ag.bring.now": "ahora mismo",
+    "ag.bring.min": "hace {n} min",
+    "ag.bring.h": "hace {n} h",
+    "ap.title": "{agent} quiere:",
+    "ap.agent": "El agente {name}",
+    "ap.noAgent": "Algo en esta máquina (sin identidad de agente)",
+    "ap.noAgentWarn": "Si no le pediste esto a un agente, deniégalo.",
+    "ap.signin.title": "Algo espera tu aprobación.",
+    "ap.signin": "Inicia sesión para verlo: ejecuta {cmd} y abre el enlace.",
+    "ap.do.workspace_create": 'Crear el espacio "{name}"',
+    "ap.do.repo_add":
+      'Añadir el repositorio de {path} al espacio "{workspace}"',
+    "ap.do.repo_add.new":
+      'Añadir el repositorio de {path} a un espacio nuevo "{workspace}"',
+    "ap.do.service_try": "Iniciar {service}",
+    "ap.says": "El agente dice:",
+    "ap.review": "Revisar",
+    "ap.hide": "Ocultar detalles",
+    "ap.later": "Más tarde",
+    "ap.deny": "Denegar",
+    "ap.allow": "Permitir",
+    "ap.waits": "Nada cambia hasta que lo permitas. Espera hasta las {time}.",
+    "ap.more": "{n} más en espera",
+    "ap.failed": "Se ejecutó y falló: {error}",
+    "ap.done": "Hecho: {what}",
     "ag.new.note":
       "Se inicia en la carpeta del espacio de trabajo. Sigue en ejecución si cierras el panel.",
     "ag.new.started": "{p} iniciado en {w}",