tumwater 0.1.2 → 0.2.0

package/dist/src/ui/gui/{gui-client-fleet.js → gui-client-team.js}

@@ -1,25 +1,27 @@
-/** The dashboard's fleet view, browser-side — the main screen between polls: the sidebar's
- * project name and fleet status (loops running, build state, main's check, quiet hours),
+// vocabulary: plain
+/** The dashboard's team view, browser-side — the main screen between polls: the sidebar's
+ * project name and team status (loops running, build state, main's check, quiet hours),
  * the alerts band for whatever needs a human (a failing loop, a red main, a spent budget,
  * an old build, open questions, a pause), today's progress tiles with their
  * per-day bar chart, the backlog with its questions/plans/bugs tabs, and the notable activity
  * feed (the loops table with its per-row actions lives in gui-client-loops.ts; the composer
- * rendered onto this view lives in gui-client-composer.ts). renderFleet repaints all of it
+ * rendered onto this view lives in gui-client-composer.ts). renderTeam repaints all of it
  * from each /api/status poll. Spliced into gui-client.ts's script, reaching its helpers (esc,
  * icon, getJson, postJson, postAction, plural, agree, recall, fmtAgo, fmtTokens, fmtUsd,
  * paintPanel, showFlash) through that concatenation. */
-export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet status, budget and pause controls ----
+export const GUI_CLIENT_TEAM_JS = String.raw `  // ---- sidebar: project, team status, budget and pause controls ----
   // restart-button:start
-  // The restart affordance's exact markup — one home shared by the sidebar's stale-build row
-  // and alertParts()'s build alert, so styling and the global [data-act='restart'] handler
-  // serve both icons from one place.
+  // The alert affordances' exact markup — one home shared by the sidebar's stale-build row and
+  // alertParts()'s build alert (a restart) and the held/reclaim disk row (a reclaim), so styling
+  // and the global [data-act='restart'] / [data-act='reclaim'] handlers serve both from one place.
+  function actionButton(glyph, act, title) {
+    return "<button type='button' class='alert-icon' data-act='" + act + "' title='" + title + "'>" + glyph + "</button>";
+  }
   function restartButton(glyph) {
-    return "<button type='button' class='alert-icon' data-act='restart' title='Restart onto the new build now'>" + glyph + "</button>";
+    return actionButton(glyph, "restart", "Restart onto the update now");
   }
-  // The disk row's reclaim affordance: its icon IS the button when the row is held or in the
-  // reclaim band; the global [data-act='reclaim'] handler posts /api/reclaim.
   function reclaimButton(glyph) {
-    return "<button type='button' class='alert-icon' data-act='reclaim' title='Reclaim idle build outputs now'>" + glyph + "</button>";
+    return actionButton(glyph, "reclaim", "Reclaim idle build outputs now");
   }
   // restart-button:end
   // sidebar:start
@@ -40,7 +42,7 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
     else {
       rows = d.running
         ? row("green", "<span class='dot live'></span>", "Running", "Orchestrator running as pid " + d.pid)
-        : row("gray", "<span class='dot'></span>", "Stopped", "Start it with tumwater run");
+        : row("gray", "<span class='dot'></span>", "Stopped", "Start it with tumwater start");
       if (d.build) {
         const stale = d.build.stale;
         // A stale build's refresh icon IS the restart button — restartButton(), the same
@@ -48,8 +50,8 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
         // decoration.
         const lead = stale ? restartButton(icon("refresh")) : icon("refresh");
         rows += row(stale ? (d.build.restartBlocked ? "amber" : "blue") : "", lead,
-          "Build <span class='mono'>" + esc(shortSha(d.build.sha)) + "</span>" + (stale ? " · " + esc(d.build.aheadCommits || 0) + " behind" : ""),
-          localizeInstants(("Running build" + (d.buildBadge || "").replace(/^, build/, "")).trim()));
+          "Version <span class='mono'>" + esc(shortSha(d.build.sha)) + "</span>" + (stale ? " · " + esc(d.build.aheadCommits || 0) + " behind" : ""),
+          localizeInstants(("Running version" + (d.buildBadge || "").replace(/^, build/, "")).trim()));
       }
       if (d.mainCheck) {
         // Main's newest merge-scope check (status-model's mainCheckBadge): green, red, or — a
@@ -70,28 +72,44 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
       // The disk floor (plans/disk-floor.md, part 4/4): the sidebar row renders the payload's
       // preformatted diskBadge (upcased for the row's label style) — the same facts the
       // TUI/status header carries, so the two surfaces cannot drift — and names the free space,
-      // the hold and the last reclaim there.
+      // and the hold there.
       if (d.diskBadge) {
         const held = Boolean(d.disk && d.disk.held);
         const low = Boolean(d.disk && !held && d.disk.reclaimGB > 0 && d.disk.freeGB < d.disk.reclaimGB);
         rows += row(held ? "amber" : "blue", held || low ? reclaimButton(icon("info")) : icon("info"),
           esc(badgeLabel(d.diskBadge)),
           held
-            ? "Free space is below the " + esc(String(d.disk.holdGB)) + " GB floor, so the fleet starts no new work until it recovers. Build outputs are reclaimed first."
+            ? "Free space is below the " + esc(String(d.disk.holdGB)) + " GB floor, so the team starts no new work until it recovers. Build outputs are reclaimed first."
             : low
               ? "Free space is below the " + esc(String(d.disk.reclaimGB)) + " GB reclaim threshold; idle build outputs are being cleaned."
-              : "The last build-output reclaim freed space on the worktrees volume.");
+              : "");
+      }
+      // The permit pool (plans/provider-concurrency.md §8): the payload's preformatted
+      // permitsBadge — running 5 of 8 · omlx 3/3 · claude 2/6 — upcased for the row's label
+      // style, the same reading the TUI/status header carries, so the two surfaces cannot
+      // drift. Empty on a map-less team, so the sidebar stays unchanged.
+      if (d.permitsBadge) {
+        const tok = String(d.permitsBadge).replace(/^ · /, "");
+        rows += row("blue", icon("gauge"), esc(tok),
+          "Roles running at once out of the team limit, then each capped provider's own running/cap; a role waits to start when its provider is at its cap.");
+      }
+      // The run --for deadline: the payload's preformatted runWindowBadge, like the disk row.
+      if (d.runWindowBadge) {
+        rows += row("blue", icon("info"), esc(badgeLabel(d.runWindowBadge)),
+          d.scheduledStopAt !== undefined && d.scheduledStopAt === d.runStopsAt
+            ? "A scheduled stop (tumwater stop --in) — the team finishes current work, then stops."
+            : "tumwater was started with start --for; at the deadline it finishes current work, prints a per-role summary, and stops.");
       }
       // The configured quiet-hours window ("Quiet hours … part 2/2"): the schedule as
       // standing information, amber while the local clock is inside it — the same
       // inside/outside wording the TUI/status header's quietBadge carries, derived from the
       // payload's raw quietHours/inQuietHours fields (the active case also raises the
-      // fleet-alerts quiet alert above).
+      // team-alerts quiet alert above).
       if (d.quietHours) {
         const end = String(d.quietHours).split("-")[1] || "";
         rows += row(d.inQuietHours ? "amber" : "", icon("pause"),
           d.inQuietHours ? "Quiet until " + esc(end) : "Quiet " + esc(d.quietHours),
-          "Quiet hours — role loops start no new ticks during this local-time window; the director keeps running your prompts");
+          "Quiet hours — roles start no new runs during this local-time window; the director keeps running your messages");
       }
       // New-project bootstrap (plans/work-ratio.md, part 2/2): the payload's preformatted
       // bootstrapBadge, upcased for the row's label style — the same reading the TUI/status
@@ -99,12 +117,13 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
       if (d.bootstrapBadge) {
         rows += row("blue", icon("info"),
           esc(badgeLabel(d.bootstrapBadge)),
-          "New-project bootstrap — the harness holds maintenance loops until enough plans are done; plan, feature and director keep ticking");
+          "New-project bootstrap — maintenance roles wait until enough plans are done; plan, feature and director keep running");
       }
     }
     paintPanel("statuschips", rows);
     renderBudgetBadge(d);
     renderPauseBadge(d);
+    renderStopControl(d);
     renderSoundBadge();
   }
   // sidebar:end
@@ -119,7 +138,7 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
   // i * 2000 spacing exists for the test path, which passes a stepped clock so each fresh
   // alert clears the window and sounds its own cue. The keys seen now are kept for the next
   // poll's diff; lastNeedsYouKeys starts null, so a page opened onto an already-alerting
-  // fleet cues once.
+  // team cues once.
   let lastNeedsYouKeys = null;
   function cueNewNeedsYou(alerts, now) {
     const fresh = newNeedsYouKeys(lastNeedsYouKeys, alerts);
@@ -136,7 +155,7 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
   // from under a click in progress.
   function alertParts(a, restartable) {
     // A stale-build alert's refresh icon IS the restart button (PLANS.md 2026-09-30): pressing
-    // it forces the fleet's self-redeploy onto main's head now instead of waiting out the
+    // it forces the team's self-redeploy onto main's head now instead of waiting out the
     // cooldown. Only the build alert carries it, and only while the build is actually stale —
     // a fresh build's icon stays inert decoration.
     const glyph = icon(ALERT_ICONS[a.key] || "info");
@@ -194,7 +213,7 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
       todayAt = Date.now();
     } catch { /* keep the last numbers */ }
     todayLoading = false;
-    if (lastStatus && activeView === "fleet") renderStats(lastStatus);
+    if (lastStatus && activeView === "team") renderStats(lastStatus);
   }
   // stats:start
   function statTile(t) {
@@ -203,27 +222,28 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
       "<span class='stat-sub'>" + t.sub + "</span>" + (t.meter || "") + (t.act ? "</button>" : "</div>");
   }
   function renderStats(d) {
-    const loops = d.loops || [];
+    const loops = d.roles || [];
     // The running set (phaseInfo.live), not the permit-holder inFlight: the exempt running
     // director is genuinely in flight, so the tile must count it even though it holds no
     // maxConcurrent permit (BUGS.md 2026-10-06).
     const live = loops.filter((l) => phaseInfo(l.phase).live);
     const kinds = {};
     for (const l of live) { const k = phaseInfo(l.phase).key; kinds[k] = (kinds[k] || 0) + 1; }
+    const KIND_WORDS = { working: "working", reviewing: "reviewing", landing: "merging" }; // vocabulary-ok: phase key, renamed with the status model // retired-name-ok: phase key, renamed with the status model
     const liveSub = live.length
-      ? ["working", "reviewing", "landing"].filter((k) => kinds[k]).map((k) => kinds[k] + " " + k).join(" · ")
-      : d.running ? "every loop is between ticks" : "the fleet is stopped";
+      ? Object.keys(KIND_WORDS).filter((k) => kinds[k]).map((k) => kinds[k] + " " + KIND_WORDS[k]).join(" · ")
+      : d.running ? "every role is between runs" : "the team is stopped";
     const t = today && today.totals;
     const plans = (d.plans || []).length;
     const bugs = (d.bugs || []).length;
     const qs = (d.questions || []).length;
     paintPanel("stats", [
-      { label: "In flight", icon: "bolt", value: live.length + " <small>of " + loops.length + " loops</small>", sub: esc(liveSub) },
-      { label: "Landed today", icon: "merge", act: "view", arg: "history", hint: "See every tick in History",
+      { label: "In flight", icon: "bolt", value: live.length + " <small>of " + loops.length + " roles</small>", sub: esc(liveSub) },
+      { label: "Merged today", icon: "merge", act: "view", arg: "history", hint: "See every run in History",
         value: t ? String(t.commits) + " <small>" + agree(t.commits, "commit", "commits") + "</small>" : "—",
         sub: t ? esc(plural(t.featuresDone, "feature") + " done · " + plural(t.bugsFixed, "bug") + " fixed · " + workSplit(t)) : "counting…" },
-      { label: "Ticks today", icon: "refresh", act: "view", arg: "usage", hint: "See usage per day and per loop",
-        value: t ? String(t.ticks) + " <small>" + agree(t.ticks, "tick", "ticks") + "</small>" : "—",
+      { label: "Runs today", icon: "refresh", act: "view", arg: "usage", hint: "See usage per day and per role",
+        value: t ? String(t.runs) + " <small>" + agree(t.runs, "run", "runs") + "</small>" : "—",
         sub: t ? esc(fmtTokens(t.tokensOut) + " output tokens" + (t.costUsd > 0 ? " · " + fmtUsd(t.costUsd) : "")) : "counting…" },
       { label: "Backlog", icon: "inbox", act: "backlog", hint: "Jump to the backlog", value: String(plans + bugs) + " <small>open</small>",
         sub: esc(plural(plans, "plan") + " · " + plural(bugs, "bug") + (qs ? " · " + plural(qs, "question") : "")) },
@@ -245,6 +265,8 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
   // guard so a poll does not repaint over the typed title.
   let backlogNew = null;
   let backlogNewPainted = false;
+  // Names of the blocked series whose parts the Plans tab currently shows.
+  let openSeries = new Set();
   function setBacklogTab(tab) {
     backlogTab = tab;
     store("backlog", tab);
@@ -259,6 +281,10 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
     backlogNewPainted = false;
     renderBacklog(backlogStatus);
   }
+  function toggleBacklogSeries(name) {
+    if (openSeries.has(name)) openSeries.delete(name); else openSeries.add(name);
+    renderBacklog(backlogStatus);
+  }
   function endBacklogNew() {
     backlogNew = null;
     backlogNewPainted = false;
@@ -276,10 +302,10 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
     renderBacklog(backlogStatus);
   }
   const BACKLOG = [
-    ["questions", "Questions", "question", "indigo", "No open questions", "Loops post here when they need a decision from you."],
-    ["plans", "Plans", "plan", "blue", "Nothing planned", "The plan loop files features in PLANS.md."],
+    ["questions", "Questions", "question", "indigo", "No open questions", "Roles post here when they need a decision from you."],
+    ["plans", "Plans", "plan", "blue", "Nothing planned", "The plan role files features in PLANS.md."],
     ["bugs", "Bugs", "bug", "red", "No open bugs", "Bugs filed in BUGS.md show up here."],
-    ["queued", "Queued", "chat", "gray", "No queued prompts", "Prompts you send wait here until their loop takes them."],
+    ["queued", "Inbox", "chat", "gray", "Inbox empty", "Messages you send wait here until their role's next run."], // vocabulary-ok: internal tab key
   ];
   function renderBacklog(d) {
     backlogStatus = d;
@@ -295,8 +321,16 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
     let html;
     if (!list.length) html = "<div class='empty'><strong>" + esc(emptyTitle) + "</strong>" + esc(emptyText) + "</div>";
     else if (key === "queued") {
+      // Each role's queue head carries no Move to top (a no-op there); every later row of
+      // that role does. The rows arrive grouped by role — director first, then each loop in
+      // id order — so a Set of roles already painted marks each group's first row.
+      const paintedFirst = new Set();
       html = list.map((q) => {
         const addr = "data-file='" + esc(q.file) + "' data-role='" + esc(q.role) + "'";
+        // Mark this role's group head before the edit-row early return, so an edited head row
+        // still leaves the Move to top button on that role's later rows.
+        const alreadyFirst = paintedFirst.has(q.role);
+        paintedFirst.add(q.role);
         // The row being edited swaps its preview for a textarea and a Save/Cancel pair; the
         // address stays the queue-file basename, the same one /api/prompt-cancel uses.
         if (queuedEdit && q.file === queuedEdit.file && q.role === queuedEdit.role) {
@@ -306,10 +340,14 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
             "<button type='button' class='btn btn-sm rowaction' data-action='prompteditsave' " + addr + ">Save</button>" +
             "<button type='button' class='btn btn-sm rowaction' data-action='prompteditcancel' " + addr + ">Cancel</button></div>";
         }
+        const topBtn = alreadyFirst
+          ? "<button type='button' class='btn btn-sm rowaction' data-action='prompttop' " + addr + ">Move to top</button>"
+          : "";
         return "<div class='list-item'><span class='li-icon'>" + icon("chat") + "</span><div class='li-main'><span class='li-title'>" + esc(q.preview) +
-          "</span><span class='li-meta'>" + esc((q.role === "director" ? "for the director" : "for the " + q.role + " loop") +
+          "</span><span class='li-meta'>" + esc((q.role === "director" ? "for the director" : "for the " + roleLabel(q.role) + " role") +
             (q.notBeforeMs && q.notBeforeMs > Date.now() ? " · delivers in " + humanSeconds(Math.round((q.notBeforeMs - Date.now()) / 1000))
               : (q.queuedAtMs ? " · queued " + fmtAgo(q.queuedAtMs) : ""))) + "</span></div>" +
+          topBtn +
           "<button type='button' class='btn btn-sm rowaction' data-action='promptcancel' " + addr + ">Cancel</button>" +
           "<button type='button' class='btn btn-sm rowaction' data-action='promptedit' " + addr + ">Edit</button></div>";
       }).join("");
@@ -319,7 +357,10 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
       // the same tab position the click sends): empty for eligible rows so their markup is
       // unchanged, and the Questions tab carries no holds.
       const holds = key === "plans" ? (d.planHolds || []) : key === "bugs" ? (d.bugHolds || []) : [];
-      html = list.map((title, i) => {
+      // Blocked entries (a hold of any kind) paint after the pickable ones under one divider;
+      // each row keeps its original data-index so the drawer and Answer still address it.
+      const blocked = key === "plans" ? (d.planBlocked || []) : key === "bugs" ? (d.bugBlocked || []) : [];
+      const rows = list.map((title, i) => {
         const t = splitTitle(title);
         const mark = holds[i] || "";
         return "<div class='list-item t-" + tone + (open === key + ":" + i ? " active" : "") + "'><span class='li-icon'>" + icon(ic) + "</span>" +
@@ -327,6 +368,37 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
           (t.meta ? "<span class='li-meta'>" + esc(t.meta) + "</span>" : "") +
           (mark ? "<span class='li-meta'>" + esc(mark.trim()) + "</span>" : "") + "</button>" +
           (key === "questions" ? "<button type='button' class='btn btn-sm backloglink' data-file='questions' data-index='" + i + "'>Answer</button>" : "") + "</div>";
+      });
+      const ready = rows.filter((r, i) => !blocked[i]);
+      const series = key === "plans" ? (d.planSeries || []) : [];
+      let heldCount = 0;
+      const held = [];
+      const seen = new Set();
+      rows.forEach((r, i) => {
+        if (!blocked[i]) return;
+        heldCount++;
+        const s = series[i];
+        if (!s) { held.push(r); return; }
+        if (seen.has(s.name)) return;
+        seen.add(s.name);
+        held.push("<div class='list-item list-series'><button type='button' class='li-open' data-action='seriestoggle' data-series='" + esc(s.name) + "'><span class='li-title'>" + esc(s.label) + "</span><span class='li-meta'>blocked: each waits on an earlier part</span></button></div>");
+        if (openSeries.has(s.name)) rows.forEach((r2, j) => { if (blocked[j] && series[j] && series[j].name === s.name) held.push(r2); });
+      });
+      html = ready.join("") + (heldCount ? "<div class='list-item list-divider'><span class='li-meta'>Blocked (" + heldCount + ")</span></div>" + held.join("") : "");
+    }
+    const answered = key === "questions" ? (d.answeredQuestions || []) : [];
+    if (answered.length) {
+      html += "<div class='list-item list-divider'><span class='li-meta'>Answered recently</span></div>" + answered.map((a, i) =>
+        "<div class='list-item t-gray" + (openEntryKey() === "answered:" + i ? " active" : "") + "'><span class='li-icon'>" + icon("check") + "</span><button type='button' class='li-open backloglink' data-file='answered' data-index='" + i + "'><span class='li-title'>" + esc(a.title) + "</span>" +
+        (a.decision ? "<span class='li-meta'>" + esc(a.decision) + "</span>" : "") + "</button></div>").join("");
+    }
+    const finished = key === "plans" ? (d.donePlans || []) : key === "bugs" ? (d.fixedBugs || []) : [];
+    if (finished.length) {
+      html += "<div class='list-item list-divider'><span class='li-meta'>" + (key === "plans" ? "Done recently" : "Fixed recently") + "</span></div>" + finished.map((f, i) => {
+        const doneFile = key === "plans" ? "done" : "fixed";
+        return "<div class='list-item t-gray" + (openEntryKey() === doneFile + ":" + i ? " active" : "") + "'><span class='li-icon'>" + icon("check") + "</span>" +
+          "<button type='button' class='li-open backloglink' data-file='" + doneFile + "' data-index='" + i + "'><span class='li-title'>" + esc(f.title) + "</span>" +
+          (f.completedOn ? "<span class='li-meta'>" + esc((key === "plans" ? "done " : "fixed ") + f.completedOn) + "</span>" : "") + "</button></div>";
       }).join("");
     }
     if (key === "plans" || key === "bugs") {
@@ -350,6 +422,8 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
     if (b) setBacklogTab(b.dataset.tab);
   });
   $("backlog").addEventListener("click", async (ev) => {
+    const ser = clickClosest(ev, "button[data-action='seriestoggle']");
+    if (ser) { toggleBacklogSeries(ser.dataset.series); return; }
     const fresh = clickClosest(ev, "button[data-action='backlognew']");
     if (fresh) { beginBacklogNew(fresh.dataset.kind); return; }
     if (clickClosest(ev, "button[data-action='backlognewcancel']")) { endBacklogNew(); return; }
@@ -359,16 +433,26 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
       const title = input ? input.value.trim() : "";
       if (!title) return;
       const bodyBox = $("backlognewbody");
-      await postAction("/api/backlog-file", { kind: freshSave.dataset.kind, title, body: bodyBox ? bodyBox.value : "" }, (d) => "Filed: " + d.title);
+      await postAction("/api/backlog-file", { kind: freshSave.dataset.kind, title, body: bodyBox ? bodyBox.value : "" }, (d) => "Filed: " + d.title + uncommittedTail(d));
       endBacklogNew();
       return;
     }
+    const top = clickClosest(ev, "button.rowaction[data-action='prompttop']");
+    if (top) {
+      await postAction("/api/prompt-top", { role: top.dataset.role, file: top.dataset.file }, (d) =>
+        d && d.status === "topped"
+          ? "Moved to the front: " + (d.preview || "")
+          : d && d.status === "already_first"
+            ? "Already first"
+            : "No longer in the inbox — " + (top.dataset.role ? roleLabel(top.dataset.role) : "the director") + " already took it");
+      return;
+    }
     const cancel = clickClosest(ev, "button.rowaction[data-action='promptcancel']");
     if (cancel) {
       await postAction("/api/prompt-cancel", { role: cancel.dataset.role, file: cancel.dataset.file }, (d) =>
         d && d.status === "cancelled"
           ? "Cancelled: " + (d.preview || "")
-          : "No longer queued — " + (cancel.dataset.role || "the director") + " already took it");
+          : "No longer in the inbox — " + (cancel.dataset.role ? roleLabel(cancel.dataset.role) : "the director") + " already took it");
       return;
     }
     const edit = clickClosest(ev, "button.rowaction[data-action='promptedit']");
@@ -376,7 +460,7 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
       try {
         const d = await getJson("/api/prompt-text?role=" + encodeURIComponent(edit.dataset.role) + "&file=" + encodeURIComponent(edit.dataset.file));
         if (d && d.status === "gone") {
-          showFlash("No longer queued — " + (edit.dataset.role || "the director") + " already took it");
+          showFlash("No longer in the inbox — " + (edit.dataset.role ? roleLabel(edit.dataset.role) : "the director") + " already took it");
           refresh();
         } else {
           beginQueuedEdit(edit.dataset.role, edit.dataset.file, (d && d.text) || "");
@@ -394,7 +478,7 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
       await postAction("/api/prompt-edit", { role: save.dataset.role, file: save.dataset.file, text }, (d) =>
         d && d.status === "edited"
           ? "Edited: " + (d.newText || "")
-          : "No longer queued — " + (save.dataset.role || "the director") + " already took it");
+          : "No longer in the inbox — " + (save.dataset.role ? roleLabel(save.dataset.role) : "the director") + " already took it");
       endQueuedEdit();
       return;
     }
@@ -411,12 +495,14 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
   // The Activity card's own narrowing, beside the Notable/All segmented choice: a Loop picker
   // and a text box filter the events the card carries, and — once a filter is set — a debounced
   // /api/logs search reaches past that carried window into the log's recent slice (the same
-  // loop/match rule 'tumwater logs --role'/'--grep' apply to the CLI feed). Both persist like
-  // the Notable/All choice, so a reload keeps the operator's scope.
+  // loop/match rule 'tumwater logs --role'/'--grep' apply to the CLI feed), while the tally
+  // chips select one exact event type the way 'tumwater logs --type <type>' does. All persist
+  // like the Notable/All choice, so a reload keeps the operator's scope.
   let feedFilter = recall("feed") === "all" ? "all" : "notable";
   let feedRole = recall("feed-role") || "";
+  let feedType = recall("feed-type") || "";
   let feedText = recall("feed-grep") || "";
-  const KINDS = { landing: ["merge", "green"], problem: ["fail", "red"], attention: ["question", "indigo"], info: ["info", "blue"], routine: ["dot", "gray"] };
+  const KINDS = { landing: ["merge", "green"], problem: ["fail", "red"], attention: ["question", "indigo"], info: ["info", "blue"], routine: ["dot", "gray"] }; // retired-name-ok: event kind key, renamed with the status model
   // Server-backed search state. feedResults is the /api/logs slice once it answers (newest
   // first, the shape renderFeed consumes), null while the card paints its carried window; the
   // debounce feedTimer keeps each keystroke from firing a request; feedSeq numbers requests
@@ -429,7 +515,9 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
   let feedError = "";
   let feedQueryKey = "";
   // Only the non-empty filters ride the query: an absent grep/role means unfiltered server-side,
-  // exactly as handleLogs reads them.
+  // exactly as handleLogs reads them. The type is deliberately NOT carried: the server slice must
+  // still deliver every type so the tally chips can be built from it — the type is a local
+  // narrowing on the rows in hand, like the Loop picker, not a query narrowing.
   function feedLogsQuery() {
     const params = [];
     if (feedText) params.push("grep=" + encodeURIComponent(feedText));
@@ -460,12 +548,36 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
     }
     if (lastStatus) renderFeed(lastStatus);
   }
-  // The Loop picker's options follow the fleet's role list (custom loops included), keyed so a
-  // poll with no roster change repaints nothing. A role the fleet dropped falls back to All
+  // The Loop picker's options follow the team's role list (custom loops included), keyed so a
+  // poll with no roster change repaints nothing. A role the team dropped falls back to All
   // loops and persists, exactly as syncRolePicker does for the report and History pickers.
   function syncFeedRoles(d) {
     if (!d) return;
-    feedRole = syncRolePicker("feedrole", (d.loops || []).map((l) => l.role), feedRole, "feed-role");
+    feedRole = syncRolePicker("feedrole", (d.roles || []).map((l) => l.role), feedRole, "feed-role");
+  }
+  // An empty feed state: a li.empty with a bold head, a body, and the shared Clear-filter
+  // button that ends all three search/error/filter-empty rows — one home for the button's
+  // markup so the three cannot drift. The last empty state (nothing notable / no events yet)
+  // carries no Clear-filter action, so it stays literal.
+  const emptyFeedRow = (head, body) => "<li class='empty'><strong>" + head + "</strong>" + body +
+    "<button type='button' class='linkish' data-action='feedclear'>Clear filter</button></li>";
+  // A per-type tally for the Activity feed, mirroring the CLI's logs --count display rule
+  // (read-only from src/cli/log-commands.ts's sayTally): one N × <type> chip per present event
+  // type, count-descending then type-name ascending. A pure function of the rows in hand, so the
+  // chips and the <li> rows below cannot drift on which events count; "" for an empty array so
+  // empty and empty-state feeds paint no stray chips. Each chip is a button: clicking the
+  // currently-selected type clears it, otherwise it selects that type (the active one carries
+  // the active class and aria-pressed), the browser twin of 'logs --type <type>'.
+  function tallyChips(events, activeType) {
+    if (!events.length) return "";
+    const counts = new Map();
+    for (const e of events) counts.set(e.type, (counts.get(e.type) || 0) + 1);
+    const chip = (type, n) => "<button type='button' class='chip mono" + (type === activeType ? " active" : "") +
+      "' data-type='" + esc(type) + "' title='" + esc(type) + "'" + (type === activeType ? " aria-pressed='true'" : "") +
+      ">" + n + " × " + esc(eventTypeLabel(type)) + "</button>";
+    return "<div class='feed-tally chips'>" + [...counts.entries()]
+      .sort((a, b) => b[1] - a[1] || (a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0))
+      .map(([type, n]) => chip(type, n)).join("") + "</div>";
   }
   function renderFeed(d) {
     syncFeedRoles(d);
@@ -480,48 +592,57 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
     const notable = feedFilter === "all" ? items : items.filter((it) => eventKind(it) !== "routine");
     const needle = feedText.toLowerCase();
     const local = notable.filter((it) =>
-      (!feedRole || it.loop === feedRole) &&
-      (!needle || (it.loop + " " + it.type + " " + it.message).toLowerCase().includes(needle)));
+      (!feedRole || it.source === feedRole) &&
+      (!needle || (it.source + " " + it.type + " " + it.message).toLowerCase().includes(needle)));
     // The server's /api/logs slice replaces the carried window once it answers; the Notable/All
     // choice still culls it. A failed fetch paints the search-empty state, never a misleading
     // partial window.
     const serverRows = feedResults !== null
       ? (feedFilter === "all" ? feedResults : feedResults.filter((it) => eventKind(it) !== "routine"))
       : null;
-    const shown = feedError ? [] : serverRows !== null ? serverRows : local;
+    // The type chip narrows whichever slice is in hand (carried window or server slice), so it
+    // composes after the Notable/All cull and the role/grep narrowing. The chips are built from
+    // the pre-type rows so every present type stays one click away even when the filter empties
+    // the feed.
+    const preType = feedError ? [] : serverRows !== null ? serverRows : local;
+    const shown = feedType ? preType.filter((it) => it.type === feedType) : preType;
     markActive($("feedfilter"), "filter", feedFilter);
-    const roles = new Set((d.loops || []).map((l) => l.role));
-    paintPanel("feed", shown.length
+    const roles = new Set((d.roles || []).map((l) => l.role));
+    paintPanel("feed", (preType.length ? tallyChips(preType, feedType) : "") + (shown.length
       ? shown.map((it) => {
         const kind = eventKind(it);
-        const tone = it.type === "tick_end" && kind === "problem" ? resultInfo(it.result).tone : KINDS[kind][1];
-        const who = roles.has(it.loop)
-          ? "<button type='button' class='linkish feed-loop' data-open='" + esc(it.loop) + "'>" + esc(it.loop) + "</button>"
-          : "<span class='feed-loop'>" + esc(it.loop) + "</span>";
+        const tone = it.type === "run_end" && kind === "problem" ? resultInfo(it.result).tone : KINDS[kind][1];
+        const whoLabel = it.source === "harness" ? "tumwater" : roleLabel(it.source); // vocabulary-ok: the harness event source
+        const who = roles.has(it.source) // vocabulary-ok: event field name
+          ? "<button type='button' class='linkish feed-loop' data-open='" + esc(it.source) + "'>" + esc(whoLabel) + "</button>" // vocabulary-ok: CSS class and event field
+          : "<span class='feed-loop'>" + esc(whoLabel) + "</span>"; // vocabulary-ok: CSS class
         return "<li class='feed-item k-" + kind + "'><span class='feed-icon t-" + tone + "'>" + icon(KINDS[kind][0]) + "</span>" +
           "<div class='feed-msg clamp2' title='" + esc(it.message) + "'>" + who + esc(it.message) + "</div>" +
           "<time class='feed-time' title='" + esc(fmtClock(it.ts)) + "'>" + esc(fmtAgo(it.ts)) + "</time></li>";
       }).join("")
       : feedResults !== null
-        ? "<li class='empty'><strong>No events match this filter in the log's recent slice</strong>" +
-          "Widen the Search or Loop picker to look further back. " +
-          "<button type='button' class='linkish' data-action='feedclear'>Clear filter</button></li>"
+        ? emptyFeedRow("No events match this filter in the log's recent slice", "Widen the Search or Role picker, or clear the type chip, to look further back. ")
         : feedError
-          ? "<li class='empty'><strong>Search unavailable</strong>" + esc(feedError) +
-            " — the running server may predate the /api/logs endpoint. " +
-            "<button type='button' class='linkish' data-action='feedclear'>Clear filter</button></li>"
-          : notable.length
-            ? "<li class='empty'><strong>No recent events match this filter</strong>" +
-              "Clear the Loop or Search box to see the recent feed again. " +
-              "<button type='button' class='linkish' data-action='feedclear'>Clear filter</button></li>"
+          ? emptyFeedRow("Search unavailable", esc(feedError) + " — the running server may predate the /api/logs endpoint. ")
+          : notable.length || preType.length
+            ? emptyFeedRow("No recent events match this filter", "Clear the Role, Search, or type chip to see the recent feed again. ")
             : "<li class='empty'><strong>" + (items.length ? "Nothing notable lately" : "No events yet") + "</strong>" +
-              (items.length ? "Landings, failures, and questions show up here. All events has every tick start and check." : "Events appear here as the loops work.") + "</li>");
+              (items.length ? "Merges, failures, and questions show up here. All events has every run start and check." : "Events appear here as the roles work.") + "</li>"));
+  }
+  // The single state change both the chip click and Clear filter use: select a type (stored so
+  // a reload keeps the scope), or clear it by passing "".
+  function setFeedType(type) {
+    feedType = type;
+    store("feed-type", type);
+    if (lastStatus) renderFeed(lastStatus);
   }
   function clearFeedFilter() {
     feedRole = "";
     feedText = "";
+    feedType = "";
     store("feed-role", "");
     store("feed-grep", "");
+    store("feed-type", "");
     if ($("feedrole")) $("feedrole").value = "";
     if ($("feedgrep")) $("feedgrep").value = "";
     if (lastStatus) renderFeed(lastStatus);
@@ -549,17 +670,20 @@ export const GUI_CLIENT_FLEET_JS = String.raw `  // ---- sidebar: project, fleet
     if (lastStatus) renderFeed(lastStatus);
   });
   // The empty state's #feed is static markup, so its delegated listener registers at load like
-  // the #feedfilter one above.
+  // the #feedfilter one above. A chip click whose type matches the current feedType clears it
+  // (toggle off), otherwise it selects that type — the same toggle the Notable/All control uses.
   $("feed").addEventListener("click", (ev) => {
-    if (clickClosest(ev, "button[data-action='feedclear']")) clearFeedFilter();
+    if (clickClosest(ev, "button[data-action='feedclear']")) { clearFeedFilter(); return; }
+    const b = clickClosest(ev, "button[data-type]");
+    if (b) setFeedType(b.dataset.type === feedType ? "" : b.dataset.type);
   });
   // activity:end
 
-  function renderFleet(d) {
-    const loops = d.loops || [];
-    const sub = plural(loops.length, "loop") + " · " + (d.running ? loops.filter((l) => phaseInfo(l.phase).live).length + " in flight" : "the fleet is stopped") +
+  function renderTeam(d) {
+    const loops = d.roles || [];
+    const sub = plural(loops.length, "role") + " · " + (d.running ? loops.filter((l) => phaseInfo(l.phase).live).length + " in flight" : "the team is stopped") +
       (d.paused ? " · paused" : "");
-    if ($("fleetsub").textContent !== sub) $("fleetsub").textContent = sub;
+    if ($("teamsub").textContent !== sub) $("teamsub").textContent = sub;
     renderStats(d);
     renderLoops(d);
     renderBacklog(d);