@pellux/goodvibes-tui 2.0.20 → 2.1.0

package/src/{panels → views}/fleet-acts.ts

@@ -1,18 +1,17 @@
 // ---------------------------------------------------------------------------
 // fleet-acts.ts
 //
-// The Fleet panel's waiting-on-human ACTS: the flagged pick row, the flagged
-// conflict row, and the worktree discard all act from the panel selection with
-// no id ever typed. This controller owns that flow so fleet-panel.ts stays under
-// the 800-line architecture cap, the panel delegates the trigger keys, the
-// pick-mode input, and the pick-mode render here.
+// The waiting-on-human ACTS in the Agents modal: the flagged pick row, the
+// flagged conflict row, and the worktree discard all act from the selected row
+// with no id ever typed. This controller owns that flow; the Agents modal
+// delegates the trigger keys and the pick-mode input here and draws pickView().
 //
 //   • Pick , the flagged workstream row (needsAttention 'pick') opens a
 //     candidate picker (best-of-N held attempts, from fleet.attempts.list);
-//     ↑↓ chooses the winner, its diff shows in the shared DiffPanel, and Enter
+//     ↑↓ chooses the winner, Enter shows its diff in a Changes preview and
 //     drives fleet.attempts.pick preview (confirm:false) -> confirm (confirm:true)
-//     through the DiffPanel's existing confirm overlay. No group/candidate id is
-//     ever typed, the panel derives them from the node and the selection.
+//     through the question on that preview. No group/candidate id is ever
+//     typed; they come from the node and the selection.
 //   • Conflict, the flagged work-item row (needsAttention 'conflict') runs
 //     fleet.conflicts.resolve and hands the STAMPED resolution session id to the
 //     shared one-key jump/attach affordance (the CI fix-session machinery). On
@@ -25,17 +24,9 @@
 import type { ProcessNode } from '@pellux/goodvibes-sdk/platform/runtime/fleet';
 import type { WorkItem } from '@pellux/goodvibes-sdk/platform/orchestration';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
-import type { Line } from '@pellux/goodvibes-sdk/platform/types';
-import { isPanelSearchBackspace, isPanelSearchCancel, isPanelSearchCommit, isPanelSearchPrintable } from './search-focus.ts';
-import { appendSteerText } from './fleet-tabs.ts';
+import { isViewSearchBackspace, isViewSearchCancel, isViewSearchCommit, isViewSearchPrintable } from './search-focus.ts';
+import { appendSteerText } from './fleet-session-tabs.ts';
 import { isObservedExternalNode, observedKindLabel, type ObservedNode } from './fleet-observed-render.ts';
-import {
-  buildKeyboardHints,
-  buildPanelWorkspace,
-  DEFAULT_PANEL_PALETTE,
-  type PanelPalette,
-} from './polish.ts';
-import { buildPanelLine } from './polish.ts';
 import { formatAgentCost } from './agent-inspector-shared.ts';
 import { fleetNodeAttention } from './fleet-read-model.ts';
 import {
@@ -48,11 +39,11 @@ import {
   type FleetHeldMergeGroup,
 } from './fleet-gateway.ts';
 
-/** The DiffPanel-backed surface the pick act reuses: show a diff, arm its confirm overlay, close it. */
+/** The Changes-preview surface the pick act reuses: show a diff, ask over it, close it. */
 export interface FleetDiffSurface {
-  /** Open + focus the diff panel showing this unified diff (title labels the candidate). */
+  /** Show this unified diff in a Changes preview (title labels the candidate). */
   show(title: string, unifiedDiff: string): void;
-  /** Arm the diff panel's existing confirm overlay (Enter/y merges, n/Esc cancels). */
+  /** Ask a yes/no question over the preview (or in a confirm dialog when none is open). */
   armConfirm(opts: {
     readonly id: string;
     readonly label: string;
@@ -60,14 +51,14 @@ export interface FleetDiffSurface {
     readonly onConfirm: () => void | Promise<void>;
     readonly onCancel?: () => void;
   }): void;
-  /** Close the diff panel and return focus to the prompt. */
+  /** Close the preview. */
   close(): void;
 }
 
 export interface FleetActsDeps {
   /** Resolve a live gateway per act (so a daemon that comes up mid-session is seen); honest unavailable reason otherwise. */
   readonly resolveGateway: () => FleetGatewayResolution;
-  /** The shared DiffPanel surface (reused for candidate diffs + the pick confirm). */
+  /** The Changes preview surface (candidate diffs + the pick confirm). */
   readonly diffSurface: FleetDiffSurface;
   /** Surface a result/receipt/error line to the operator (system message, high priority). */
   readonly notify: (message: string) => void;
@@ -85,7 +76,15 @@ interface PickMode {
   selectedHeldIndex: number;
 }
 
-const C = DEFAULT_PANEL_PALETTE;
+/** The candidate picker, as data the Agents modal draws. */
+export interface FleetPickView {
+  readonly title: string;
+  readonly candidates: ReadonlyArray<{ readonly label: string; readonly detail: string; readonly selected: boolean }>;
+  /** The selected candidate's unified diff, or null when it has none. */
+  readonly diff: string | null;
+  /** The model's advisory proposal, or null. */
+  readonly proposal: string | null;
+}
 
 function shortId(id: string): string {
   return id.length > 10 ? `${id.slice(0, 10)}…` : id;
@@ -120,7 +119,7 @@ export class FleetActs {
   /**
    * Dispatch an act-trigger key pressed on the tree while `node` is selected.
    * Returns true when consumed (an act fired), false to fall through to the
-   * panel's ordinary key handling (so Enter still attaches an agent tab, etc.).
+   * Agents modal's ordinary key handling (so Enter still attaches an agent tab, etc.).
    */
   public handleTreeKey(key: string, node: ProcessNode): boolean {
     if (key === 'enter' || key === 'return') {
@@ -172,10 +171,10 @@ export class FleetActs {
   /** Input while the observed-steer composer is open (mirrors the tab steer composer). */
   public handleObservedSteerInput(key: string): boolean {
     if (!this.observedSteer) return false;
-    if (isPanelSearchCancel(key)) { this.observedSteer = null; this.deps.markDirty(); return true; }
-    if (isPanelSearchCommit(key)) { void this.submitObservedSteer(); return true; }
-    if (isPanelSearchBackspace(key)) { this.observedSteer.draft = this.observedSteer.draft.slice(0, -1); this.deps.markDirty(); return true; }
-    if (key.length === 1 && (isPanelSearchPrintable(key) || key === '\r' || key === '\n')) {
+    if (isViewSearchCancel(key)) { this.observedSteer = null; this.deps.markDirty(); return true; }
+    if (isViewSearchCommit(key)) { void this.submitObservedSteer(); return true; }
+    if (isViewSearchBackspace(key)) { this.observedSteer.draft = this.observedSteer.draft.slice(0, -1); this.deps.markDirty(); return true; }
+    if (key.length === 1 && (isViewSearchPrintable(key) || key === '\r' || key === '\n')) {
       this.observedSteer.draft = appendSteerText(this.observedSteer.draft, key);
       this.deps.markDirty();
       return true;
@@ -203,11 +202,11 @@ export class FleetActs {
     }
   }
 
-  // ── Task-graph posture (in-panel edges/pool under a workstream) ───────────
+  // ── Task-graph posture (in-view edges/pool under a workstream) ───────────
 
   /**
    * Lazily fetch the task graph (fleet.graph.get) for a selected workstream row
-   * so the in-panel detail can render its edges/pool posture WITHOUT opening
+   * so the in-view detail can render its edges/pool posture WITHOUT opening
    * /graph. Idempotent: fetches once per node (cache + in-flight guard), quiet
    * on an unavailable daemon (caches null rather than nagging every frame). A
    * no-op for any non-workstream node.
@@ -248,7 +247,6 @@ export class FleetActs {
     }
     if (!group) { this.deps.notify('No ready best-of-N group on this workstream; every attempt must settle first.'); return; }
     this.pick = { workstreamNodeId: node.id, group, selectedHeldIndex: 0 };
-    this.showSelectedDiff();
     this.deps.markDirty();
   }
 
@@ -259,13 +257,11 @@ export class FleetActs {
     if (key === 'escape' || key === 'esc') { this.pick = null; this.deps.markDirty(); return true; }
     if (key === 'up' || key === 'k') {
       this.pick.selectedHeldIndex = (this.pick.selectedHeldIndex - 1 + held.length) % held.length;
-      this.showSelectedDiff();
       this.deps.markDirty();
       return true;
     }
     if (key === 'down' || key === 'j') {
       this.pick.selectedHeldIndex = (this.pick.selectedHeldIndex + 1) % held.length;
-      this.showSelectedDiff();
       this.deps.markDirty();
       return true;
     }
@@ -273,18 +269,9 @@ export class FleetActs {
     return true; // absorb every other key while the picker owns the view
   }
 
-  private showSelectedDiff(): void {
-    if (!this.pick) return;
-    const cand = heldCandidates(this.pick.group)[this.pick.selectedHeldIndex];
-    if (!cand) return;
-    const diff = cand.diff?.unifiedDiff?.trim();
-    if (diff) this.deps.diffSurface.show(cand.title, cand.diff!.unifiedDiff);
-    else this.deps.diffSurface.show(cand.title, '@@ pick @@\n (no diff to preview for this candidate)');
-  }
-
   /**
-   * Drive fleet.attempts.pick preview (confirm:false) then, behind the DiffPanel
-   * confirm overlay, confirm (confirm:true). No id is typed, the group id and
+   * Drive fleet.attempts.pick preview (confirm:false) then, behind the question
+   * on the candidate's Changes preview, confirm (confirm:true). No id is typed, the group id and
    * the winner item id both come from the picker state.
    */
   private async confirmSelectedPick(): Promise<void> {
@@ -394,48 +381,25 @@ export class FleetActs {
     return true;
   }
 
-  // ── Render (pick mode) ────────────────────────────────────────────────────
+  // ── Pick mode, as data ────────────────────────────────────────────────────
 
-  /** The candidate picker view (replaces the tree while pick mode is active). */
-  public renderPickMode(width: number, height: number, palette: PanelPalette = C): Line[] {
-    const P = palette;
-    if (!this.pick) return [];
-    const { group } = this.pick;
+  /** The candidate picker while pick mode is active, else null. */
+  public pickView(): FleetPickView | null {
+    if (!this.pick) return null;
+    const { group, selectedHeldIndex } = this.pick;
     const held = heldCandidates(group);
-    const lines: Line[] = [];
-    lines.push(buildPanelLine(width, [
-      [' Best-of-N winner pick: ', P.label],
-      [group.sourceTitle, P.value],
-    ]));
-    lines.push(buildPanelLine(width, [[' Choose the winner; its diff shows in the diff panel. No id is typed.', P.dim]]));
-    lines.push(buildPanelLine(width, [['', P.dim]]));
-    held.forEach((cand, index) => {
-      const selected = index === this.pick!.selectedHeldIndex;
-      const files = cand.diff ? `${cand.diff.files.length} file(s)` : 'no diff';
-      const cost = cand.usage.costUsd !== null && cand.usage.costState !== 'unpriced'
-        ? formatAgentCost(cand.usage.costUsd)
-        : 'unpriced';
-      lines.push(buildPanelLine(width, [
-        [selected ? ' ▸ ' : '   ', selected ? P.info : P.dim],
-        [`${cand.attemptIndex + 1}. `, P.label],
-        [cand.title, selected ? P.value : P.dim],
-        [`, ${files}, ${cost}`, P.dim],
-      ]));
-    });
-    if (group.judgment?.proposedWinnerItemId) {
-      const proposed = held.find((c) => c.itemId === group.judgment!.proposedWinnerItemId);
-      lines.push(buildPanelLine(width, [['', P.dim]]));
-      lines.push(buildPanelLine(width, [
-        [' judge proposal (model, advisory): ', P.label],
-        [proposed ? `attempt ${proposed.attemptIndex + 1}` : shortId(group.judgment.proposedWinnerItemId), P.info],
-      ]));
-    }
-    const footerLines = [buildKeyboardHints(width, [
-      { keys: '↑↓', label: 'choose' },
-      { keys: 'Enter', label: 'pick (confirm)' },
-      { keys: 'Esc', label: 'cancel' },
-    ], P)];
-    return buildPanelWorkspace(width, height, { title: 'Fleet: Pick winner', sections: [{ lines }], footerLines, palette: P });
+    const proposedId = group.judgment?.proposedWinnerItemId;
+    const proposed = proposedId ? held.find((c) => c.itemId === proposedId) : undefined;
+    return {
+      title: group.sourceTitle,
+      candidates: held.map((cand, index) => {
+        const files = cand.diff ? `${cand.diff.files.length} file${cand.diff.files.length === 1 ? '' : 's'}` : 'no diff';
+        const cost = cand.usage.costUsd !== null && cand.usage.costState !== 'unpriced' ? formatAgentCost(cand.usage.costUsd) : 'unpriced';
+        return { label: `${cand.attemptIndex + 1}. ${cand.title}`, detail: `${files} · ${cost}`, selected: index === selectedHeldIndex };
+      }),
+      proposal: proposedId ? (proposed ? `attempt ${proposed.attemptIndex + 1}` : shortId(proposedId)) : null,
+      diff: held[selectedHeldIndex]?.diff?.unifiedDiff?.trim() ? held[selectedHeldIndex]!.diff!.unifiedDiff : null,
+    };
   }
 
   private requireGateway(): FleetGateway | null {

package/src/{panels/fleet-panel-format.ts → views/fleet-format.ts}

@@ -1,33 +1,33 @@
 // ---------------------------------------------------------------------------
-// fleet-panel-format.ts
+// fleet-format.ts
 //
-// Pure column-layout + cell-formatting helpers for FleetPanel's tree rows.
-// Extracted from fleet-panel.ts (file-size hygiene) to hold that file under the
-// 800-line architecture cap; these are stateless functions the panel's
+// Pure column-layout + cell-formatting helpers for the Agents modal's tree rows.
+// Extracted from src/input/agents-modal.ts (file-size hygiene) to hold that file under the
+// 800-line architecture cap; these are stateless functions the Agents modal's
 // renderItem/renderDetail call, with no `this` dependency.
 // ---------------------------------------------------------------------------
 
 import type { ProcessCostState, ProcessNode, ProcessReviewSummary, ProcessUsage } from '@pellux/goodvibes-sdk/platform/runtime/fleet';
 import type { Line } from '@pellux/goodvibes-sdk/platform/types';
 import { formatAgentCost } from './agent-inspector-shared.ts';
-import { buildPanelLine, DEFAULT_PANEL_PALETTE, type ColumnSpec, type PanelPalette } from './polish.ts';
+import { buildViewLine, DEFAULT_VIEW_PALETTE, type ColumnSpec, type ViewPalette } from './polish.ts';
 import { fleetAttentionText, fleetNodeAttention, fleetStallMarker, fleetUsageTokens, hasFleetCost, type FleetStateTone } from './fleet-read-model.ts';
 import { fleetStateDisplay } from './fleet-stop.ts';
 import { formatElapsed } from '../utils/format-elapsed.ts';
 import { truncateDisplay } from '../utils/terminal-width.ts';
-import { conflictFilesFromRaw, formatWorkItemIsolationDetailFromRaw } from './fleet-panel-worktree-detail.ts';
+import { conflictFilesFromRaw, formatWorkItemIsolationDetailFromRaw } from './fleet-worktree-detail.ts';
 import { wrapText } from '../utils/terminal-width.ts';
 import { buildAlignedRow } from './polish.ts';
 import { fleetKindTag } from './fleet-read-model.ts';
 import { steerBadgeGlyph, steerBadgeTone } from './fleet-steer.ts';
-import type { SteerBadge } from './fleet-tabs.ts';
+import type { SteerBadge } from './fleet-session-tabs.ts';
 import type { FleetTreeRow } from './fleet-read-model.ts';
 import { isObservedExternalNode, renderObservedDetailLines, renderObservedRowLine } from './fleet-observed-render.ts';
 import { renderPoolSummary, type WorkstreamGraphSnapshot } from './workstream-graph-render.ts';
 
 // Column widths for the tree row layout. `label` absorbs whatever width is
 // left over after the fixed columns + gaps; on hostile (narrow) widths the
-// trailing columns simply clip (buildAlignedRow/buildSelectablePanelLine stop
+// trailing columns simply clip (buildAlignedRow/buildSelectableViewLine stop
 // writing once a cell would overflow the row) rather than throwing or
 // wrapping, the tree stays readable, just denser.
 const KIND_W = 8;
@@ -51,12 +51,12 @@ export function planColumns(width: number): ColumnSpec[] {
   ];
 }
 
-export function toneColor(tone: FleetStateTone, palette: PanelPalette): string {
+export function toneColor(tone: FleetStateTone, palette: ViewPalette): string {
   switch (tone) {
-    case 'active': return palette.info ?? DEFAULT_PANEL_PALETTE.info;
-    case 'success': return palette.good ?? DEFAULT_PANEL_PALETTE.good;
-    case 'failure': return palette.bad ?? DEFAULT_PANEL_PALETTE.bad;
-    case 'warn': return palette.warn ?? DEFAULT_PANEL_PALETTE.warn;
+    case 'active': return palette.info ?? DEFAULT_VIEW_PALETTE.info;
+    case 'success': return palette.good ?? DEFAULT_VIEW_PALETTE.good;
+    case 'failure': return palette.bad ?? DEFAULT_VIEW_PALETTE.bad;
+    case 'warn': return palette.warn ?? DEFAULT_VIEW_PALETTE.warn;
     case 'muted': return palette.dim;
   }
 }
@@ -75,7 +75,7 @@ export function formatFleetCost(costUsd: number | null | undefined, costState: P
 }
 
 /**
- * One fleet tree row. Pure (extracted from FleetPanel.renderItem for the
+ * One fleet tree row. Pure (extracted from the Agents modal's row renderer for the
  * 800-line cap). Two display-only overrides in priority order: an in-flight
  * `stopping` wins the glyph/label/activity, then a `blocked`-on-user node gets
  * the ⚑ badge + 'blocked on you' in the activity slot. Otherwise a queued-steer
@@ -87,7 +87,7 @@ export function renderFleetRowLine(
   stopping: boolean,
   blocked: boolean,
   badge: SteerBadge | null,
-  palette: PanelPalette = DEFAULT_PANEL_PALETTE,
+  palette: ViewPalette = DEFAULT_VIEW_PALETTE,
 ): Line {
   const C = palette;
   const node = row.node;
@@ -133,7 +133,7 @@ export function renderFleetRowLine(
       : badge
         ? steerBadgeTone(badge.status, C)
         : stallMarker
-          ? (C.warn ?? DEFAULT_PANEL_PALETTE.warn)
+          ? (C.warn ?? DEFAULT_VIEW_PALETTE.warn)
           : C.dim;
 
   return buildAlignedRow(
@@ -153,7 +153,7 @@ export function renderFleetRowLine(
 
 /**
  * The selected-node detail block under the fleet tree. Pure (extracted from
- * FleetPanel.renderDetail to hold that file under the 800-line architecture
+ * the Agents modal's detail renderer to hold that file under the 800-line architecture
  * cap). `stopping`/`blocked` are display-only overrides the caller derives from
  * the stop tracker + node state, mirror the tree row exactly so the literal
  * 'state' text never claims a past-tense outcome mid-write, and a
@@ -166,13 +166,13 @@ export function renderFleetRowLine(
  * whether it was verified, the evidence, and (when present) how it was
  * exercised, matching what the webui's review detail surfaces.
  */
-export function renderReviewLines(review: ProcessReviewSummary, width: number, palette: PanelPalette = DEFAULT_PANEL_PALETTE): Line[] {
+export function renderReviewLines(review: ProcessReviewSummary, width: number, palette: ViewPalette = DEFAULT_VIEW_PALETTE): Line[] {
   const C = palette;
   const passTone = C.good ?? C.info;
-  const failTone = C.bad ?? C.warn ?? DEFAULT_PANEL_PALETTE.warn;
+  const failTone = C.bad ?? C.warn ?? DEFAULT_VIEW_PALETTE.warn;
   const cyclesLabel = review.cycles === 1 ? '1 cycle' : `${review.cycles} cycles`;
   const lines: Line[] = [
-    buildPanelLine(width, [
+    buildViewLine(width, [
       [' review ', C.label],
       [review.passed ? '✓ passed' : '✗ not passed', review.passed ? passTone : failTone],
       ['  score ', C.label], [String(review.score), C.value],
@@ -181,25 +181,25 @@ export function renderReviewLines(review: ProcessReviewSummary, width: number, p
   ];
   if (review.checklist.length === 0) {
     // Empty checklist is itself a gate failure, say so honestly, don't hide it.
-    lines.push(buildPanelLine(width, [['   ', C.dim], ['(the reviewer emitted no acceptance checklist; a gate failure)', failTone]]));
+    lines.push(buildViewLine(width, [['   ', C.dim], ['(the reviewer emitted no acceptance checklist; a gate failure)', failTone]]));
     return lines;
   }
   for (const it of review.checklist) {
     const mark = it.verified ? '[verified]  ' : '[unverified]';
     const markTone = it.verified ? passTone : failTone;
     wrapText(it.item, Math.max(1, width - 16)).forEach((seg, i) => {
-      lines.push(buildPanelLine(width, i === 0
+      lines.push(buildViewLine(width, i === 0
         ? [['   ', C.dim], [`${mark} `, markTone], [seg, C.value]]
         : [['                ', C.dim], [seg, C.value]]));
     });
     if (it.evidence) {
       for (const seg of wrapText(`evidence: ${it.evidence}`, Math.max(1, width - 6))) {
-        lines.push(buildPanelLine(width, [['     ', C.dim], [seg, C.dim]]));
+        lines.push(buildViewLine(width, [['     ', C.dim], [seg, C.dim]]));
       }
     }
     if (it.howExercised) {
       for (const seg of wrapText(`exercised: ${it.howExercised}`, Math.max(1, width - 6))) {
-        lines.push(buildPanelLine(width, [['     ', C.dim], [seg, C.dim]]));
+        lines.push(buildViewLine(width, [['     ', C.dim], [seg, C.dim]]));
       }
     }
   }
@@ -212,22 +212,22 @@ export function renderReviewLines(review: ProcessReviewSummary, width: number, p
  * only via /graph, /graph still works). Fetched lazily and cached by fleet-acts;
  * rendered only once a snapshot is in hand. An empty graph states so honestly.
  */
-export function renderGraphPostureLines(graph: WorkstreamGraphSnapshot, width: number, palette: PanelPalette = DEFAULT_PANEL_PALETTE): Line[] {
+export function renderGraphPostureLines(graph: WorkstreamGraphSnapshot, width: number, palette: ViewPalette = DEFAULT_VIEW_PALETTE): Line[] {
   const C = palette;
   const lines: Line[] = [
-    buildPanelLine(width, [[' graph ', C.label], [renderPoolSummary(graph.pool), C.value]]),
+    buildViewLine(width, [[' graph ', C.label], [renderPoolSummary(graph.pool), C.value]]),
   ];
   if (graph.edges.length === 0) {
-    lines.push(buildPanelLine(width, [['   ', C.dim], ['no dependency edges', C.dim]]));
+    lines.push(buildViewLine(width, [['   ', C.dim], ['no dependency edges', C.dim]]));
     return lines;
   }
   const titleById = new Map(graph.nodes.map((n) => [n.id, n.title]));
-  lines.push(buildPanelLine(width, [[' edges ', C.label], [`${graph.edges.length} dependency link(s)`, C.value]]));
+  lines.push(buildViewLine(width, [[' edges ', C.label], [`${graph.edges.length} dependency link(s)`, C.value]]));
   for (const edge of graph.edges) {
     const from = titleById.get(edge.from) ?? edge.from;
     const to = titleById.get(edge.to) ?? edge.to;
     for (const seg of wrapText(`${from} → ${to}`, Math.max(1, width - 5))) {
-      lines.push(buildPanelLine(width, [['   ', C.dim], [seg, C.dim]]));
+      lines.push(buildViewLine(width, [['   ', C.dim], [seg, C.dim]]));
     }
   }
   return lines;
@@ -238,7 +238,7 @@ export function renderFleetDetailLines(
   width: number,
   stopping: boolean,
   blocked: boolean,
-  palette: PanelPalette = DEFAULT_PANEL_PALETTE,
+  palette: ViewPalette = DEFAULT_VIEW_PALETTE,
   observedSteerDraft: string | null = null,
   graphSnapshot: WorkstreamGraphSnapshot | null = null,
 ): Line[] {
@@ -257,7 +257,7 @@ export function renderFleetDetailLines(
     ? fleetAttentionText(fleetNodeAttention(node) ?? { reason: 'approval' })
     : disp.label;
 
-  const line1 = buildPanelLine(width, [
+  const line1 = buildViewLine(width, [
     [' ', C.dim],
     [disp.glyph, color],
     [` ${node.kind}`, C.dim],
@@ -268,7 +268,7 @@ export function renderFleetDetailLines(
     ['  elapsed ', C.label],
     [formatElapsed(node.elapsedMs), C.value],
   ]);
-  const line2 = buildPanelLine(width, [
+  const line2 = buildViewLine(width, [
     [' model ', C.label],
     [node.model ?? 'unknown', C.info],
     ['  tokens ', C.label],
@@ -284,20 +284,20 @@ export function renderFleetDetailLines(
     ? `${node.headline.text}${stallMarker ? ` · ${stallMarker}` : ''}`
     : stallMarker;
   const headlineLine = headlineText
-    ? [buildPanelLine(width, [
+    ? [buildViewLine(width, [
         [' headline ', C.label],
-        [truncateDisplay(headlineText, Math.max(0, width - 11)), stallMarker ? (C.warn ?? DEFAULT_PANEL_PALETTE.warn) : C.value],
+        [truncateDisplay(headlineText, Math.max(0, width - 11)), stallMarker ? (C.warn ?? DEFAULT_VIEW_PALETTE.warn) : C.value],
       ])]
     : [];
   const activityText = node.currentActivity
     ? `${node.currentActivity.kind}: ${node.currentActivity.text}`
     : '(no recent activity)';
-  const line3 = buildPanelLine(width, [
+  const line3 = buildViewLine(width, [
     [' activity ', C.label],
     [truncateDisplay(activityText, Math.max(0, width - 11)), C.dim],
   ]);
   // Approval history attaches here once session tabs land.
-  const line4 = buildPanelLine(width, [[' approvals ', C.label], ['—', C.dim]]);
+  const line4 = buildViewLine(width, [[' approvals ', C.label], ['—', C.dim]]);
   const isolationDetail = node.kind === 'work-item' ? formatWorkItemIsolationDetailFromRaw(node.raw) : null;
   // A merge-conflict row shows its STRUCTURED conflicting-path list, wrapped so a
   // long path is fully readable, never clipped (STEP 4: the conflict row acts,
@@ -305,13 +305,13 @@ export function renderFleetDetailLines(
   const conflictFiles = node.kind === 'work-item' ? conflictFilesFromRaw(node.raw) : null;
   const conflictLines: Line[] = conflictFiles
     ? [
-      buildPanelLine(width, [[' conflicts ', C.label], [`${conflictFiles.length} file(s): press Enter to resolve`, C.warn ?? DEFAULT_PANEL_PALETTE.warn]]),
+      buildViewLine(width, [[' conflicts ', C.label], [`${conflictFiles.length} file(s): press Enter to resolve`, C.warn ?? DEFAULT_VIEW_PALETTE.warn]]),
       // Prefix is 3 spaces of indent + a 2-col bullet/continuation marker, so
       // wrap the path at width-5 to keep the composed line within `width`
       // (a hard-wrapped long path is fully readable, never clipped).
       ...conflictFiles.flatMap((file) =>
         wrapText(file, Math.max(1, width - 5)).map((segment, i) =>
-          buildPanelLine(width, [['   ', C.dim], [i === 0 ? `• ${segment}` : `  ${segment}`, C.value]]),
+          buildViewLine(width, [['   ', C.dim], [i === 0 ? `• ${segment}` : `  ${segment}`, C.value]]),
         ),
       ),
     ]
@@ -320,7 +320,7 @@ export function renderFleetDetailLines(
   // (served on node.review; absent before any review, never an empty shell).
   const reviewLines = node.review ? renderReviewLines(node.review, width, C) : [];
   // The task graph's edges/pool posture for a workstream row (fetched + cached
-  // by fleet-acts); rendered in-panel under the chain, /graph still available.
+  // by fleet-acts); rendered in-view under the chain, /graph still available.
   const graphLines = graphSnapshot ? renderGraphPostureLines(graphSnapshot, width, C) : [];
-  return [line1, line2, ...headlineLine, line3, line4, ...(isolationDetail ? [buildPanelLine(width, [[' isolation ', C.label], [isolationDetail, C.dim]])] : []), ...conflictLines, ...reviewLines, ...graphLines];
+  return [line1, line2, ...headlineLine, line3, line4, ...(isolationDetail ? [buildViewLine(width, [[' isolation ', C.label], [isolationDetail, C.dim]])] : []), ...conflictLines, ...reviewLines, ...graphLines];
 }

package/src/{panels → views}/fleet-gateway.ts

@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------------
 // fleet-gateway.ts
 //
-// The async, daemon-backed verb surface the Fleet panel's waiting-on-human acts
+// The async, daemon-backed verb surface the Agents modal's waiting-on-human acts
 // drive, a best-of-N winner pick (fleet.attempts.list / fleet.attempts.pick),
 // a merge-conflict resolution (fleet.conflicts.resolve), and a worktree discard
 // (worktrees.discard). These are gateway verbs with no named facade on the
@@ -9,10 +9,10 @@
 // go over the generic operator invoke path (operator-rpc.ts's resolveOperatorRpc
 // -> sdk.operator.invoke), reaching the SAME daemon the command layer does.
 //
-// The panel never types an id: it derives the workstream/work-item id from the
+// The view never types an id: it derives the workstream/work-item id from the
 // selected node's namespaced id (workstream:<id> / work-item:<id>, the SDK's own
 // fleet-adapter id scheme) and drives the verbs from there. The interface is
-// injectable so the panel's act flow round-trips against a mocked daemon in
+// injectable so the Agents modal's act flow round-trips against a mocked daemon in
 // tests; the live builder (createFleetGateway) is wired in builtin/operations.ts.
 // ---------------------------------------------------------------------------
 
@@ -38,7 +38,7 @@ export type FleetGraphSnapshot = OperatorMethodOutput<'fleet.graph.get'>;
 export type FleetObservedSteerResult = OperatorMethodOutput<'fleet.observed.steer'>;
 
 /**
- * The narrow async verb surface the Fleet panel's acts drive. Every method is a
+ * The narrow async verb surface the Agents modal's acts drive. Every method is a
  * real daemon round-trip in production (createFleetGateway) and a mocked shape
  * in tests. `armFixSessionAttach` is the ONLY sync member, it hands a spawned
  * session id to the shared one-key jump affordance (the CI fix-session
@@ -97,7 +97,7 @@ export interface FleetGatewayDeps {
 /**
  * Build the live Fleet gateway over the generic operator invoke path, the same
  * daemon resolution the command layer uses (resolveOperatorRpc). Returns an
- * honest unavailable reason when no daemon is reachable, so the panel acts can
+ * honest unavailable reason when no daemon is reachable, so the Agents modal acts can
  * refuse cleanly instead of throwing into the render loop.
  */
 export function createFleetGateway(deps: FleetGatewayDeps): FleetGatewayResolution {

package/src/{panels → views}/fleet-observed-render.ts

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-// fleet-observed-render.ts, the fleet-pane rows for observed FOREIGN coding
+// fleet-observed-render.ts, the Agents modal rows for observed FOREIGN coding
 // agents (kind 'observed-external').
 //
 // goodvibes did NOT spawn these, they are externally-launched Claude Code /
@@ -7,7 +7,7 @@
 // FIRST job is visibility ("it's in claude or codex"): goodvibes never presents
 // itself as the foreign session's cockpit. So an observed row:
 //   - shows its honest external kind + a liveness-derived state (active/quiet),
-//   - is NEVER counted in any of the panel's own-fleet counts,
+//   - is NEVER counted in any of the Agents modal's own-fleet counts,
 //   - carries NO stop affordance, ever,
 //   - offers steer as a DRILL-IN only (in the detail view), and only where a
 //     real channel exists; where steer.kind is 'none' the detail states why.
@@ -15,7 +15,7 @@
 
 import type { ProcessNode, ProcessObserved, ObservedAgentKind } from '@pellux/goodvibes-sdk/platform/runtime/fleet';
 import type { Line } from '@pellux/goodvibes-sdk/platform/types';
-import { buildPanelLine, buildSearchInputLine, DEFAULT_PANEL_PALETTE, type PanelPalette } from './polish.ts';
+import { buildViewLine, buildSearchInputLine, DEFAULT_VIEW_PALETTE, type ViewPalette } from './polish.ts';
 import { truncateDisplay, wrapText } from '../utils/terminal-width.ts';
 
 /** An observed-external node carries its foreign-agent facts on `observed`. */
@@ -47,7 +47,7 @@ function livenessGlyph(state: ProcessObserved['liveness']['state']): string {
  * no stop marker, just the glyph, an "observed" tag, the session label, its
  * external kind, and its liveness state.
  */
-export function renderObservedRowLine(node: ObservedNode, width: number, palette: PanelPalette = DEFAULT_PANEL_PALETTE): Line {
+export function renderObservedRowLine(node: ObservedNode, width: number, palette: ViewPalette = DEFAULT_VIEW_PALETTE): Line {
   const C = palette;
   const observed = node.observed;
   const glyph = livenessGlyph(observed.liveness.state);
@@ -56,9 +56,9 @@ export function renderObservedRowLine(node: ObservedNode, width: number, palette
   // overflows the row (the tell is the honesty signal, it must survive).
   const tell = `${kindLabel} · ${observed.liveness.state}`;
   const labelBudget = Math.max(4, width - tell.length - 14);
-  return buildPanelLine(width, [
+  return buildViewLine(width, [
     [' ', C.dim],
-    [glyph, observed.liveness.state === 'active' ? (C.info ?? DEFAULT_PANEL_PALETTE.info) : C.dim],
+    [glyph, observed.liveness.state === 'active' ? (C.info ?? DEFAULT_VIEW_PALETTE.info) : C.dim],
     [' observed ', C.dim],
     [truncateDisplay(node.label, labelBudget), C.value],
     ['  ', C.dim],
@@ -79,13 +79,13 @@ export function renderObservedRowLine(node: ObservedNode, width: number, palette
  * "s: steer" hint. A channel-less row never shows an input (owner ruling), its
  * detail states the honest reason and stops there.
  */
-export function renderObservedDetailLines(node: ObservedNode, width: number, palette: PanelPalette = DEFAULT_PANEL_PALETTE, steerDraft: string | null = null): Line[] {
+export function renderObservedDetailLines(node: ObservedNode, width: number, palette: ViewPalette = DEFAULT_VIEW_PALETTE, steerDraft: string | null = null): Line[] {
   const C = palette;
   const observed = node.observed;
   const lines: Line[] = [];
-  lines.push(buildPanelLine(width, [
+  lines.push(buildViewLine(width, [
     [' ', C.dim],
-    [livenessGlyph(observed.liveness.state), observed.liveness.state === 'active' ? (C.info ?? DEFAULT_PANEL_PALETTE.info) : C.dim],
+    [livenessGlyph(observed.liveness.state), observed.liveness.state === 'active' ? (C.info ?? DEFAULT_VIEW_PALETTE.info) : C.dim],
     [' observed ', C.dim],
     [observedKindLabel(observed.externalKind), C.value],
     ['  pid ', C.label],
@@ -94,11 +94,11 @@ export function renderObservedDetailLines(node: ObservedNode, width: number, pal
     [observed.liveness.state, C.value],
   ]));
   if (observed.cwd) {
-    lines.push(buildPanelLine(width, [[' cwd ', C.label], [truncateDisplay(observed.cwd, Math.max(0, width - 6)), C.dim]]));
+    lines.push(buildViewLine(width, [[' cwd ', C.label], [truncateDisplay(observed.cwd, Math.max(0, width - 6)), C.dim]]));
   }
   // Liveness meaning, verbatim, honest about what 'quiet' can and cannot tell.
   for (const segment of wrapText(observed.liveness.detail, Math.max(1, width - 2))) {
-    lines.push(buildPanelLine(width, [[' ', C.dim], [segment, C.dim]]));
+    lines.push(buildViewLine(width, [[' ', C.dim], [segment, C.dim]]));
   }
   // Steer is a drill-in: a real channel is named here (a message sent from this
   // detail travels over it, fleet.observed.steer), and where none exists the
@@ -107,22 +107,22 @@ export function renderObservedDetailLines(node: ObservedNode, width: number, pal
   const steerText = observed.steer.kind === 'tmux'
     ? `available via tmux pane ${observed.steer.paneId} (send-keys)`
     : `unavailable: ${observed.steer.reason}`;
-  const steerFg = observed.steer.kind === 'tmux' ? (C.info ?? DEFAULT_PANEL_PALETTE.info) : C.dim;
+  const steerFg = observed.steer.kind === 'tmux' ? (C.info ?? DEFAULT_VIEW_PALETTE.info) : C.dim;
   const steerSegments = wrapText(steerText, Math.max(1, width - 8));
   steerSegments.forEach((segment, i) => {
-    lines.push(buildPanelLine(width, [[i === 0 ? ' steer ' : '       ', C.label], [segment, steerFg]]));
+    lines.push(buildViewLine(width, [[i === 0 ? ' steer ' : '       ', C.label], [segment, steerFg]]));
   });
   // Drill-in compose input: only where a real channel exists. An active draft
   // renders the input line + send/cancel hint; otherwise a discoverability hint.
   if (observed.steer.kind === 'tmux') {
     if (steerDraft !== null) {
       lines.push(buildSearchInputLine(width, ' send ', `${steerDraft}_`, C, { active: true, bg: C.inputBg, valueColor: C.info }));
-      lines.push(buildPanelLine(width, [['       ', C.label], ['Enter: send  Esc: cancel', C.dim]]));
+      lines.push(buildViewLine(width, [['       ', C.label], ['Enter: send  Esc: cancel', C.dim]]));
     } else {
-      lines.push(buildPanelLine(width, [['       ', C.label], ['s: steer this session', C.dim]]));
+      lines.push(buildViewLine(width, [['       ', C.label], ['s: steer this session', C.dim]]));
     }
   }
   // Visibility, not a cockpit: there is no stop here, by design.
-  lines.push(buildPanelLine(width, [[' stop ', C.label], ['not offered: goodvibes only observes this foreign session', C.dim]]));
+  lines.push(buildViewLine(width, [[' stop ', C.label], ['not offered: goodvibes only observes this foreign session', C.dim]]));
   return lines;
 }