tumwater 0.1.2 → 0.2.0

package/dist/src/ui/gui/gui-client.js

@@ -1,8 +1,9 @@
+// vocabulary: plain
 /** The browser-side dashboard app inlined as the GUI page's only <script>. It polls /api/status
- * every second and renders, in the order an operator needs them: the masthead's fleet status
- * (running, build, main check) and fleet controls (budget, pause); alerts for whatever needs a
+ * every second and renders, in the order an operator needs them: the masthead's team status
+ * (running, build, main check) and team controls (budget, pause); alerts for whatever needs a
  * human (a failing loop, a red main, a spent budget, an old build, open questions, a pause);
- * the composer that steers the director or one loop; and the fleet view — today's progress,
+ * the composer that steers the director or one loop; and the team view — today's progress,
  * the loops grouped by what they are doing, the backlog, and the notable activity. The
  * view-model, the drawer, the History/Usage/Failures/Pending views, the operator controls, the
  * composer, the Markdown renderer, and the routing/poll boot live in their own modules and
@@ -13,8 +14,9 @@
 import { GUI_CLIENT_BOOT_JS } from "./gui-client-boot.js";
 import { GUI_CLIENT_COMPOSER_JS } from "./gui-client-composer.js";
 import { GUI_CLIENT_DRAWER_JS } from "./gui-client-drawer.js";
-import { GUI_CLIENT_FLEET_JS } from "./gui-client-fleet.js";
+import { GUI_CLIENT_TEAM_JS } from "./gui-client-team.js";
 import { GUI_CLIENT_HISTORY_JS } from "./gui-client-history.js";
+import { GUI_CLIENT_LABELS_JS } from "./gui-client-labels.js";
 import { GUI_CLIENT_LOOPS_JS } from "./gui-client-loops.js";
 import { GUI_CLIENT_MARKDOWN_JS } from "./gui-client-markdown.js";
 import { GUI_CLIENT_MODEL_JS } from "./gui-client-model.js";
@@ -101,13 +103,13 @@ const CORE_JS = String.raw `  const esc = (s) => String(s).replace(/[&<>"']/g, (
   }
   // post-action:start
   // Fire one POST and report its outcome in the flash bar, then close any open popover and
-  // repaint: on success the message — a string, or the derived form the fleet callers build
+  // repaint: on success the message — a string, or the derived form the team callers build
   // from the endpoint's answer (which can be null when it sent no JSON) — on failure
   // "error: <reason>" with the popover left open and the standing 1s status poll repainting
-  // from the server's state. The one POST-and-toast step every fleet and operator control
+  // from the server's state. The one POST-and-toast step every team and operator control
   // shares. Single-homed here, in the core before every splice: a second declaration in a
   // later splice would shadow this one (function declarations hoist; the last in one scope
-  // wins), which is how the budget editor once called the fleet shape with a string message.
+  // wins), which is how the budget editor once called the team shape with a string message.
   async function postAction(path, body, okMsg) {
     let d;
     try {
@@ -134,15 +136,15 @@ const FORMAT_JS = String.raw `  // format:start
   // A cap: whole dollars stay bare ($15), fractional ones keep their cents — format.ts's usdCap.
   const fmtCap = (n) => "$" + n.toFixed(2).replace(/\.00$/, "");
   // The number-agreeing word form when the count prints elsewhere in the markup — phrases.ts's
-  // agree, shared by plural below and gui-client-fleet.ts's stats tiles, whose noun sits in
+  // agree, shared by plural below and gui-client-team.ts's stats tiles, whose noun sits in
   // <small>.
   const agree = (n, one, many) => (n === 1 ? one : many);
   const plural = (n, one, many) => n + " " + agree(n, one, many || one + "s");
-  // The landed-commit work/maintenance split the sidebar's "Landed today" tile and the report's
-  // "Commits landed" tile both print. report-data.ts leaves the counts optional, so a missing
+  // The merged-commit work/maintenance split the sidebar's "Merged today" tile and the report's
+  // "Commits merged" tile both print. report-data.ts leaves the counts optional, so a missing
   // count reads 0 here rather than "undefined".
   const workSplit = (t) => (t.workCommits ?? 0) + " work / " + (t.maintenanceCommits ?? 0) + " maintenance";
-  // The unlanded-commit list both change views paint — each commit's sha and subject on its
+  // The unmerged-commit list both change views paint — each commit's sha and subject on its
   // own clamped line. The Pending roster's Ahead cell and the loop drawer's Pending change
   // section had the byte-identical map; a missing or non-array list paints nothing.
   const commitRowsHtml = (commits) =>
@@ -194,20 +196,20 @@ const FORMAT_JS = String.raw `  // format:start
   // last-tick-fmt:end
   // next-run-fmt:start
   // When an idle loop may tick again — status-render.ts's nextRunCell: "-" for a loop in flight
-  // or parked awaiting a slot (it has no next run to speak of) and for a stopped fleet; "now"
+  // or parked awaiting a slot (it has no next run to speak of) and for a stopped team; "now"
   // when due; otherwise the remaining time, prefixed "backoff " while backing off. A yield-scaled
   // clock rides as a " ×N" suffix: a quiet role's effective gap is longer than the countdown.
-  const fmtNextRun = (l, fleetRunning) => {
+  const fmtNextRun = (l, teamRunning) => {
     // A torn loop object — a payload missing its phase field — reads as the empty (inactive)
     // phase rather than throwing: the browser copy is untyped, and its sibling phaseInfo/
     // loopRank already coerce the same way, so one bad row must not blank the whole table.
     const phase = String(l.phase || "");
-    const active = isActivePhase(phase) || phase.startsWith("awaiting slot") || phase.startsWith("director working");
-    if (!fleetRunning || active) return "-";
+    const active = isActivePhase(phase) || phase.startsWith("waiting to start") || phase.startsWith("waiting for ") || phase.startsWith("director working");
+    if (!teamRunning || active) return "-";
     const sec = Math.round((l.nextRunAt - Date.now()) / 1000);
     const suffix = l.yieldMultiplier > 1 ? " ×" + l.yieldMultiplier : "";
     if (sec <= 0) return "now" + suffix;
-    return (l.backoffSeconds > 0 ? "backoff " : "") + humanSeconds(sec) + suffix;
+    return (l.backoffSeconds > 0 ? "sleeping " : "") + humanSeconds(sec) + suffix;
   };
   // next-run-fmt:end
   // A relative age for lists; the first minute reads "just now" so rows do not churn every
@@ -227,6 +229,10 @@ const FORMAT_JS = String.raw `  // format:start
     if (min < 120) return min + "m";
     return (ms / 3600000).toFixed(1) + "h";
   };
+  // A run's wall-clock span cell: fmtSpan when a row carries a duration, a dash when it does not
+  // (a tick whose start sits outside the window). Shared by the History table and summary rows
+  // (and any future duration cell) so the null rule and its em-dash cannot drift between them.
+  const durCell = (ms) => (ms === null || ms === undefined ? "—" : esc(fmtSpan(Number(ms))));
   // Server text sometimes carries ISO instants (a restart cooldown's deadline); show them in
   // the viewer's local time.
   const localizeInstants = (s) => String(s).replace(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z/g, (iso) => fmtClock(Date.parse(iso)));
@@ -248,7 +254,7 @@ const DOM_JS = String.raw `  const ICONS = ${JSON.stringify(ICON_PATHS)};
       if (t) fn(t, ev);
     });
   }
-  // The Element a delegated click landed on, narrowed by closest(selector): null when the
+  // The Element a delegated click merged on, narrowed by closest(selector): null when the
   // click's target is not an Element (a text node, say) or nothing matches. One home for the
   // instanceof-Element guard every per-element delegated handler on the page needs before it
   // can read ev.target (the same pitfall onClick guards for document-level handlers), so the
@@ -259,7 +265,7 @@ const DOM_JS = String.raw `  const ICONS = ${JSON.stringify(ICON_PATHS)};
   }
   // click-delegate:end
   const pill = (info) => "<span class='pill t-" + info.tone + "'><span class='dot" + (info.live ? " live" : "") + "'></span>" + esc(info.label) + "</span>";
-  // Repaint a panel only when its markup changed: an idle fleet's payload is identical poll
+  // Repaint a panel only when its markup changed: an idle team's payload is identical poll
   // after poll, and rewriting identical HTML re-parses it, churns layout, and drops the
   // reader's text selection for nothing. Returns true when it repainted.
   const lastPaint = {};
@@ -341,7 +347,7 @@ const DOM_JS = String.raw `  const ICONS = ${JSON.stringify(ICON_PATHS)};
   let lastStatus = null;
   let serverBuildSha = null;
   let offline = false;
-  let activeView = "fleet";
+  let activeView = "team";
 `;
-export const GUI_CLIENT_JS = [CORE_JS, FORMAT_JS, GUI_CLIENT_MODEL_JS, DOM_JS, GUI_CLIENT_MARKDOWN_JS, GUI_CLIENT_SOUND_JS, GUI_CLIENT_OPERATOR_JS, GUI_CLIENT_LOOPS_JS, GUI_CLIENT_FLEET_JS, GUI_CLIENT_COMPOSER_JS,
+export const GUI_CLIENT_JS = [CORE_JS, FORMAT_JS, GUI_CLIENT_LABELS_JS, GUI_CLIENT_MODEL_JS, DOM_JS, GUI_CLIENT_MARKDOWN_JS, GUI_CLIENT_SOUND_JS, GUI_CLIENT_OPERATOR_JS, GUI_CLIENT_LOOPS_JS, GUI_CLIENT_TEAM_JS, GUI_CLIENT_COMPOSER_JS,
     GUI_CLIENT_DRAWER_JS, GUI_CLIENT_HISTORY_JS, GUI_CLIENT_PENDING_JS, GUI_CLIENT_REPORT_JS, GUI_CLIENT_SETTINGS_JS, GUI_CLIENT_BOOT_JS].join("\n");

package/dist/src/ui/gui/gui-page.js

@@ -1,10 +1,10 @@
 /** The dashboard page shell served at `/` by `tumwater gui`: the markup of the zero-dependency
  * single-file app, with its stylesheet (gui-styles.ts) and browser logic (gui-client.ts)
- * inlined. The shell is a sidebar beside a main column. The sidebar is the fleet's frame on
- * every view: which project this is and whether its fleet is up (build, main check), the
- * views — Fleet's carrying a badge while something needs a human — and the fleet-wide
+ * inlined. The shell is a sidebar beside a main column. The sidebar is the team's frame on
+ * every view: which project this is and whether its team is up (build, main check), the
+ * views — Team's carrying a badge while something needs a human — and the team-wide
  * controls: today's spend against the cap, and pause. The main column shows one view at a
- * time: Fleet (alerts for whatever needs a human, the composer that steers the director or
+ * time: Team (alerts for whatever needs a human, the composer that steers the director or
  * one loop, today's progress, every loop grouped by what it is doing, the backlog, and the
  * notable activity), History, Usage, Failures, Pending, or Settings. A drawer opens any
  * loop's detail and live transcript, or any backlog entry in full. Kept apart from
@@ -26,9 +26,9 @@ export const GUI_PAGE = `<!doctype html>
 <body>
 <a class="skip" href="#main">Skip to content</a>
 <div class="shell">
-<aside class="sidebar" aria-label="Fleet">
+<aside class="sidebar" aria-label="Team">
   <div class="side-top">
-    <a class="brand" href="#fleet" aria-label="tumwater fleet">${LOGO_SVG}<span>tumwater</span></a>
+    <a class="brand" href="#team" aria-label="tumwater team">${LOGO_SVG}<span>tumwater</span></a>
     <div class="side-top-actions">
       <span id="soundwrap"></span>
       <button type="button" class="icon-btn" id="themetoggle" title="Switch between light and dark" aria-label="Switch between light and dark">${iconSvg("sun", "theme-sun")}${iconSvg("moon", "theme-moon")}</button>
@@ -40,7 +40,7 @@ export const GUI_PAGE = `<!doctype html>
     <div class="side-status" id="statuschips" aria-live="polite"></div>
   </div>
   <nav class="side-nav" id="viewnav" aria-label="Views">
-    <a href="#fleet" id="tab-fleet" class="tab active" aria-current="page">${iconSvg("grid")}<span>Fleet</span><span class="badge t-red" id="navbadge" hidden></span></a>
+    <a href="#team" id="tab-team" class="tab active" aria-current="page">${iconSvg("grid")}<span>Team</span><span class="badge t-red" id="navbadge" hidden></span></a>
     <a href="#history" id="tab-history" class="tab">${iconSvg("list")}<span>History</span></a>
     <a href="#usage" id="tab-usage" class="tab">${iconSvg("bars")}<span>Usage</span></a>
     <a href="#failures" id="tab-failures" class="tab">${iconSvg("alert")}<span>Failures</span></a>
@@ -50,24 +50,24 @@ export const GUI_PAGE = `<!doctype html>
   <div class="side-controls">
     <div class="menu-anchor up" id="budgetwrap"></div>
     <div class="menu-anchor up" id="pausewrap"></div>
+    <div class="menu-anchor up" id="stopwrap"></div>
   </div>
 </aside>
 <main id="main" class="main">
-  <section id="fleet-view" class="view" aria-labelledby="fleet-title">
+  <section id="team-view" class="view" aria-labelledby="team-title">
     <div class="view-head">
-      <div><h1 id="fleet-title">Fleet</h1><p id="fleetsub">&nbsp;</p></div>
+      <div><h1 id="team-title">Team</h1><p id="teamsub">&nbsp;</p></div>
     </div>
     <div id="alerts" class="alerts" aria-live="polite"></div>
     <form id="promptform" class="composer" autocomplete="off">
       <div class="composer-row">
         <label class="composer-target"><span class="sr-only">Send to</span><select id="prompttarget" class="field"><option value="director">Director</option></select></label>
-        <textarea id="prompt" rows="1" placeholder="Tell the fleet what to do next…" aria-label="Prompt"></textarea>
+        <textarea id="prompt" rows="1" placeholder="Tell the team what to do next…" aria-label="Prompt"></textarea>
         <button type="submit" class="btn btn-primary" id="promptsend" title="Send (Enter)">${iconSvg("send")}<span>Send</span></button>
       </div>
       <div id="promptimages" class="chips" hidden></div>
+      <div id="promptimagenote" class="composer-note" hidden></div>
       <div class="composer-foot">
-        <label class="sr-only" for="promptdefer">Defer until</label>
-        <input class="field" id="promptdefer" type="text" placeholder="defer (45m)" autocomplete="off">
         <span id="prompthint"></span>
         <span class="composer-meta"><span id="promptcount"></span><a href="#" id="queuelink" hidden></a></span>
       </div>
@@ -75,16 +75,16 @@ export const GUI_PAGE = `<!doctype html>
     <div id="stats" class="stats"></div>
     <section class="card" aria-labelledby="loops-title">
       <header class="card-head">
-        <h2 id="loops-title">Loops</h2>
+        <h2 id="loops-title">Roles</h2>
         <div class="spacer"></div>
-        <button type="button" class="btn btn-sm" id="resetall" title="Zero every loop's ticks, commits, tokens, and cost — scheduling is untouched">${iconSvg("refresh")}<span>Reset counters</span></button>
-        <div class="menu-anchor" id="wakelaterwrap"><button type="button" class="btn btn-sm" id="wakelater" aria-haspopup="menu" title="Wake every loop later">${iconSvg("clock")}<span>Wake later</span></button></div>
-        <button type="button" class="btn btn-sm" id="wakeall" title="Wake every loop now, skipping any sleep or backoff">${iconSvg("bolt")}<span>Wake all</span></button>
+        <button type="button" class="btn btn-sm" id="resetall" title="Zero every role's runs, commits, tokens, and cost — scheduling is untouched">${iconSvg("refresh")}<span>Reset counters</span></button>
+        <div class="menu-anchor" id="wakelaterwrap"><button type="button" class="btn btn-sm" id="wakelater" aria-haspopup="menu" title="Wake every role later">${iconSvg("clock")}<span>Wake later</span></button></div>
+        <button type="button" class="btn btn-sm" id="wakeall" title="Wake every role now, skipping any sleep">${iconSvg("bolt")}<span>Wake all</span></button>
       </header>
       <div class="table-wrap">
         <table class="table loops" id="loopstable">
-          <thead><tr><th class="c-loop">Loop</th><th class="c-status">Status</th><th class="c-activity">Now, or the last result</th><th class="c-today num">Spent today</th><th class="c-actions"><span class="sr-only">Actions</span></th></tr></thead>
-          <tbody id="loops"></tbody>
+          <thead><tr><th class="c-loop">Role</th><th class="c-status">Status</th><th class="c-activity">Now, or the last result</th><th class="c-today num">Spent today</th><th class="c-actions"><span class="sr-only">Actions</span></th></tr></thead>
+          <tbody id="rolerows"></tbody>
         </table>
       </div>
     </section>
@@ -104,7 +104,7 @@ export const GUI_PAGE = `<!doctype html>
           <div class="seg" id="feedfilter" role="tablist" aria-label="Activity filter">
             <button type="button" data-filter="notable" class="active">Notable</button><button type="button" data-filter="all">All events</button>
           </div>
-          <label><span class="sr-only">Loop</span><select class="field" id="feedrole"><option value="">All loops</option></select></label>
+          <label><span class="sr-only">Role</span><select class="field" id="feedrole"><option value="">All roles</option></select></label>
           <label><span class="sr-only">Search</span><input class="field" id="feedgrep" type="search" placeholder="Search activity…" autocomplete="off"></label>
         </header>
         <ol id="feed" class="feed"></ol>

package/dist/src/ui/gui/gui-styles.js

@@ -2,7 +2,7 @@
  * A small neutral design system of tumwater's own: the platform's UI and monospace fonts, a
  * neutral gray scale, flat surfaces with hairline borders, and one accent — teal, for water —
  * for the primary action, links, focus, and progress. Status reads through a fixed set of
- * tones (blue working, violet reviewing, orange landing, green landed, amber held, red broken,
+ * tones (blue working, violet reviewing, orange merge, green merged, amber held, red broken,
  * gray idle) that every chip, pill, and alert shares. Every color is a token on :root,
  * redefined for dark mode both for the OS preference (unless the viewer chose light) and for
  * an explicit `data-theme="dark"`, so the page follows the system until the theme toggle
@@ -113,7 +113,7 @@ export const GUI_STYLES = String.raw `
   :focus-visible { outline: 2px solid var(--focus); outline-offset: 2px; }
   .spacer { flex: 1; }
 
-  /* ---- shell: the sidebar (project, fleet status, views, fleet controls) beside the main
+  /* ---- shell: the sidebar (project, team status, views, team controls) beside the main
      column ---- */
   .shell { display: grid; grid-template-columns: 248px minmax(0, 1fr); min-height: 100vh; }
   .sidebar { position: sticky; top: 0; height: 100vh; display: flex; flex-direction: column; gap: 18px; padding: 16px 12px;
@@ -262,6 +262,7 @@ export const GUI_STYLES = String.raw `
   .composer .btn-primary { height: 34px; }
   .composer.dragover { border-color: var(--primary); background: var(--accent-bg); }
   #promptimages { padding: 6px 4px 0; }
+  #promptimagenote { padding: 0 4px 6px; font-size: 12px; color: var(--text-3); }
   #promptimages .chip { font-size: 12px; }
   #promptimages .chip .dim { color: var(--text-3); }
   #promptimages .chip button { border: 0; background: none; color: var(--text-3); cursor: pointer; font-size: 14px;
@@ -285,7 +286,7 @@ export const GUI_STYLES = String.raw `
   .stat-value { display: block; margin-top: 4px; font-size: 24px; line-height: 1.2; font-weight: 650; letter-spacing: -0.02em;
                 font-variant-numeric: tabular-nums; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
   .stat-value small { font-size: 13.5px; font-weight: 500; letter-spacing: 0; color: var(--text-3); }
-  .stat-sub { display: block; margin-top: 2px; font-size: 12.5px; color: var(--text-3); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+  .stat-sub { display: block; margin-top: 2px; font-size: 12.5px; line-height: 1.4; min-height: calc(2 * 1.4em); color: var(--text-3); }
   .meter { display: block; height: 5px; margin-top: 9px; border-radius: 999px; background: var(--surface-3); overflow: hidden; }
   .meter > span { display: block; height: 100%; border-radius: inherit; background: var(--primary); }
   .meter.t-red > span, .meter.t-amber > span { background: var(--t); }
@@ -357,6 +358,9 @@ export const GUI_STYLES = String.raw `
   .list-item { display: flex; align-items: flex-start; gap: 10px; padding: 10px 16px; border-bottom: 1px solid var(--line-soft); }
   .list-item:last-child { border-bottom: 0; }
   .list-item:hover { background: var(--surface-2); }
+  .list-divider { padding: 6px 16px; background: var(--surface-2); }
+  .list-divider:hover { background: var(--surface-2); }
+  .list-series .li-title { font-weight: 600; }
   .list-item.active { background: var(--accent-bg); }
   .li-icon { color: var(--t, var(--text-4)); padding-top: 2px; }
   .li-open { flex: 1; min-width: 0; display: block; padding: 0; border: 0; background: none; text-align: left; cursor: pointer; }
@@ -378,6 +382,10 @@ export const GUI_STYLES = String.raw `
   .feed-item.k-routine .feed-msg { color: var(--text-3); }
   .feed-loop { font-family: var(--font-mono); font-size: 12.5px; font-weight: 600; color: var(--text); margin-right: 4px; }
   .feed-time { font-size: 12px; color: var(--text-4); white-space: nowrap; font-variant-numeric: tabular-nums; padding-top: 1px; }
+  .feed-tally { display: flex; flex-wrap: wrap; gap: 6px; padding: 10px 16px 6px; border-bottom: 1px solid var(--line-soft); }
+  .feed-tally .chip { height: 22px; padding: 0 9px; font-size: 12px; font-weight: 500; }
+  .feed-tally button.chip { cursor: pointer; }
+  .feed-tally .chip.active { border-color: var(--accent); background: var(--accent-bg); color: var(--text); }
 
   /* ---- drawer: a loop's detail and live transcript, or one backlog entry ---- */
   .drawer { position: fixed; top: 0; right: 0; bottom: 0; z-index: 50; width: min(660px, 100vw); display: flex;
@@ -494,7 +502,7 @@ export const GUI_STYLES = String.raw `
     .stats { grid-template-columns: repeat(2, minmax(0, 1fr)); }
     table.loops .c-today { display: none; }
     .kv { grid-template-columns: repeat(2, minmax(0, 1fr)); }
-    .history .c-usage, .history .c-dur { display: none; }
+    .history .c-usage, .history .c-dur, .history .c-model { display: none; }
   }
   @media (max-width: 680px) {
     .stats.six { grid-template-columns: repeat(2, minmax(0, 1fr)); }

package/dist/src/ui/progress-data.js

@@ -1,6 +1,8 @@
+// vocabulary: plain
 import path from "node:path";
 import { applyToolExecutionEvent, parsePiEventLine, toolCallCommand, } from "../pi/pi-event-line.js";
 import { bufferedCommandStallMs, commandBuffersOutput } from "../pi/command-shape.js";
+import { streamsToolOutput } from "../agent/backend-traits.js";
 import { describeToolCall } from "../text/phrases.js";
 import { squash } from "../text/text.js";
 import { defaultConfig, liveConfig } from "../config/config.js";
@@ -190,7 +192,7 @@ export function stalledToolLabel(open, now = Date.now(), stallMs = defaultConfig
         // claude never sends content-bearing tool updates, so silence is expected for every call
         // and only the wall-clock duration can show a hang (plans/agent-backends.md "Watchdogs and
         // progress"); pi keeps the per-command classification.
-        if (agent === "claude" || commandBuffersOutput(call.command || call.label)) {
+        if (!streamsToolOutput(agent) || commandBuffersOutput(call.command || call.label)) {
             if (now - call.lastActivityAt >= bufferedCommandStallMs(stallMs))
                 return call.label;
             continue;
@@ -204,7 +206,7 @@ export function stalledToolLabel(open, now = Date.now(), stallMs = defaultConfig
  * `tumwater_run` marker or a `session` event switches which accumulator following lines fold
  * into. A marker carries the run's kind, so a `session` preceded by one keeps that kind even
  * when author and gate runs share a worktree (part 1/5 of the worktree pool); only a session
- * no kind-bearing marker preceded falls back to the legacy `cwd` test (the lander worktree
+ * no kind-bearing marker preceded falls back to the legacy `cwd` test (the merge slot worktree
  * path = gate), which is how logs written before the marker carried a kind still demux. A
  * marker also starts that kind's accumulator fresh before the session lands, so a previous
  * run's turns/context can never show in the new run's cell. Everything else folds into the
@@ -227,7 +229,7 @@ function feedDemuxed(tail, line, gateCwd) {
     if (event.type === "tumwater_run") {
         const kind = event.kind === "gate" || event.kind === "author" ? event.kind : undefined;
         if (kind) {
-            // Every run writes this marker before pi spawns, and the landing cell reads the
+            // Every run writes this marker before pi spawns, and the merge cell reads the
             // accumulator as soon as the marker's stage says `reviewing` — a poll that can land
             // before the session event. Resetting here means a previous run's turns/context (the
             // last review, or another run the gate spent) can never show in the new run's cell.