bosun 0.42.2 → 0.42.4

package/ui/modules/state.js

@@ -64,6 +64,60 @@ function _cacheFresh(url, group) {
   const e = _apiCache.get(url);
   return e ? (Date.now() - e.fetchedAt) < (CACHE_TTL[group] || 10000) : false;
 }
+function mergeTaskLinkageRecords(...sources) {
+  const merged = [];
+  const indexByKey = new Map();
+  const keyFor = (record) => {
+    if (!record || typeof record !== "object") return "";
+    const branchName = String(record.branchName || "").trim().toLowerCase();
+    const prUrl = String(record.prUrl || "").trim().toLowerCase();
+    const prNumber = Number.parseInt(String(record.prNumber ?? ""), 10);
+    return [branchName, Number.isFinite(prNumber) && prNumber > 0 ? prNumber : "", prUrl].join("|");
+  };
+  for (const source of sources) {
+    const records = Array.isArray(source) ? source : [];
+    for (const record of records) {
+      if (!record || typeof record !== "object") continue;
+      const normalized = { ...record };
+      const key = keyFor(normalized);
+      if (!key) continue;
+      if (indexByKey.has(key)) {
+        const idx = indexByKey.get(key);
+        merged[idx] = { ...merged[idx], ...normalized };
+        continue;
+      }
+      indexByKey.set(key, merged.length);
+      merged.push(normalized);
+    }
+  }
+  return merged;
+}
+
+export function mergeTaskRecords(existingTask, incomingTask) {
+  const merged = { ...(existingTask || {}), ...(incomingTask || {}) };
+  const existingMeta = existingTask?.meta && typeof existingTask.meta === "object" ? existingTask.meta : {};
+  const incomingMeta = incomingTask?.meta && typeof incomingTask.meta === "object" ? incomingTask.meta : {};
+  merged.meta = { ...existingMeta, ...incomingMeta };
+  const linkage = mergeTaskLinkageRecords(
+    existingTask?.prLinkage,
+    existingMeta?.prLinkage,
+    incomingTask?.prLinkage,
+    incomingMeta?.prLinkage,
+  );
+  if (linkage.length > 0) {
+    merged.prLinkage = linkage;
+    merged.meta.prLinkage = linkage;
+    const primaryLinkage = linkage[0] || null;
+    if (primaryLinkage?.branchName) merged.branchName = primaryLinkage.branchName;
+    if (primaryLinkage?.prUrl) merged.prUrl = primaryLinkage.prUrl;
+    if (Number.isFinite(primaryLinkage?.prNumber) && primaryLinkage.prNumber > 0) merged.prNumber = primaryLinkage.prNumber;
+    merged.meta.prLinkageSource = primaryLinkage?.source || incomingMeta?.prLinkageSource || existingMeta?.prLinkageSource || null;
+    merged.meta.prLinkageFreshness = primaryLinkage?.freshness || incomingMeta?.prLinkageFreshness || existingMeta?.prLinkageFreshness || null;
+    merged.meta.prLinkageUpdatedAt = primaryLinkage?.updatedAt || incomingMeta?.prLinkageUpdatedAt || existingMeta?.prLinkageUpdatedAt || null;
+  }
+  return merged;
+}
+
 function _cacheClearGroup(group) {
   for (const k of _apiCache.keys()) {
     if (k.includes(group) || group === '*') _apiCache.delete(k);
@@ -124,27 +178,28 @@ function normalizeTaskDiagnosticsForUi(diagnostics) {
 
 function normalizeTaskForUi(task) {
   if (!task || typeof task !== "object") return task;
-  const title = sanitizeTaskText(task.title || "");
-  const rawDescription = sanitizeTaskText(task.description || "");
+  const hydratedTask = mergeTaskRecords(null, task);
+  const title = sanitizeTaskText(hydratedTask.title || "");
+  const rawDescription = sanitizeTaskText(hydratedTask.description || "");
   const description = isPlaceholderTaskDescription(rawDescription) ? "" : rawDescription;
-  const diagnostics = normalizeTaskDiagnosticsForUi(task.diagnostics);
-  const meta = task.meta && typeof task.meta === "object"
+  const diagnostics = normalizeTaskDiagnosticsForUi(hydratedTask.diagnostics);
+  const meta = hydratedTask.meta && typeof hydratedTask.meta === "object"
     ? {
-        ...task.meta,
-        title: task.meta.title != null ? sanitizeTaskText(task.meta.title) : task.meta.title,
+        ...hydratedTask.meta,
+        title: hydratedTask.meta.title != null ? sanitizeTaskText(hydratedTask.meta.title) : hydratedTask.meta.title,
         description:
-          task.meta.description != null
-            ? (isPlaceholderTaskDescription(task.meta.description)
+          hydratedTask.meta.description != null
+            ? (isPlaceholderTaskDescription(hydratedTask.meta.description)
               ? ""
-              : sanitizeTaskText(task.meta.description))
-            : task.meta.description,
-        diagnostics: normalizeTaskDiagnosticsForUi(task.meta.diagnostics),
+              : sanitizeTaskText(hydratedTask.meta.description))
+            : hydratedTask.meta.description,
+        diagnostics: normalizeTaskDiagnosticsForUi(hydratedTask.meta.diagnostics),
       }
-    : task.meta;
+    : hydratedTask.meta;
   return {
-    ...task,
+    ...hydratedTask,
     title,
-    description: description || synthesizeTaskDescription({ ...task, title }),
+    description: description || synthesizeTaskDescription({ ...hydratedTask, title }),
     diagnostics,
     meta,
   };
@@ -164,7 +219,7 @@ function mergeTaskPages(existingTasks = [], incomingTasks = []) {
       if (key) indexById.set(key, merged.length - 1);
       continue;
     }
-    merged[indexById.get(key)] = { ...merged[indexById.get(key)], ...task };
+    merged[indexById.get(key)] = mergeTaskRecords(merged[indexById.get(key)], task);
   }
   return merged;
 }
@@ -1070,3 +1125,4 @@ export function initWsInvalidationListener() {
       });
   });
 }
+

package/ui/tabs/workflows.js

@@ -336,6 +336,9 @@ function formatRetryDecisionReason(reason) {
 function formatIssueAdvisorAction(action) {
   const normalized = String(action || "").trim().toLowerCase();
   if (normalized === "replan_from_failed") return "Replan from failed node";
+  if (normalized === "replan_subgraph") return "Replan downstream subgraph";
+  if (normalized === "rerun_same_step") return "Rerun same step";
+  if (normalized === "spawn_fix_step") return "Spawn targeted fix step";
   if (normalized === "resume_remaining") return "Resume remaining work";
   if (normalized === "inspect_failure") return "Inspect failure first";
   if (normalized === "continue") return "Continue";
@@ -5400,10 +5403,11 @@ function RunHistoryView() {
         ? selectedRun.detail.issueAdvisor
         : null;
     const dagCounts = getRunDagCounts(selectedRun);
+    const dagRevisions = Array.isArray(selectedRun?.detail?.dagState?.revisions) ? selectedRun.detail.dagState.revisions : [];
     const ledgerEvents = Array.isArray(selectedRun?.ledger?.events) ? selectedRun.ledger.events : [];
     const recommendedRetryMode =
       selectedRun?.status === "failed"
-        ? (selectedRun?.issueAdvisorRecommendation === "replan_from_failed" ? "from_scratch" : "from_failed")
+        ? ((selectedRun?.issueAdvisorRecommendation === "replan_from_failed" || selectedRun?.issueAdvisorRecommendation === "replan_subgraph") ? "from_scratch" : "from_failed")
         : "";
     const recommendedRetryLabel = formatRetryModeLabel(recommendedRetryMode);
 
@@ -5522,7 +5526,9 @@ function RunHistoryView() {
               <div><b>Completed:</b> ${dagCounts.completed}/${dagCounts.nodeCount}</div>
               <div><b>Failed:</b> ${dagCounts.failed} · <b>Skipped:</b> ${dagCounts.skipped} · <b>Active:</b> ${dagCounts.active}</div>
               <div><b>Recommendation:</b> ${formatIssueAdvisorAction(issueAdvisor?.recommendedAction)}</div>
+              <div><b>Decision Class:</b> ${formatIssueAdvisorAction(issueAdvisor?.retryDecisionClass || issueAdvisor?.recommendedAction)}</div>
               <div style="margin-top: 6px; color: #e5e7eb;">${issueAdvisor?.summary || "No issue-advisor summary recorded for this run."}</div>
+              ${issueAdvisor?.nextStepGuidance && html`<div style="margin-top: 6px; color: #cbd5e1;">${issueAdvisor.nextStepGuidance}</div>`}
             </div>
           </div>
 
@@ -5552,6 +5558,24 @@ function RunHistoryView() {
           </div>
         </div>
 
+        <details style="background: var(--color-bg-secondary, #1a1f2e); border: 1px solid var(--color-border, #2a3040); border-radius: 8px; padding: 10px 12px; margin-bottom: 12px;">
+          <summary style="cursor: pointer; font-weight: 600; font-size: 13px;">DAG Revisions (${dagRevisions.length})</summary>
+          <div style="display:flex; flex-direction:column; gap:8px; margin-top:8px;">
+            ${dagRevisions.length === 0 && html`<div style="font-size:12px; opacity:0.6;">No DAG revision history recorded.</div>`}
+            ${dagRevisions.map((revision) => html`
+              <div style="border:1px solid #334155; border-radius:6px; padding:8px; background:#0f172a; font-size:12px; color:#cbd5e1;">
+                <div><b>Revision ${revision.index}:</b> ${revision.reason || "update"}</div>
+                <div><b>Recorded:</b> ${formatDate(revision.recordedAt)}</div>
+                <div><b>Counts:</b> completed=${Number(revision?.counts?.completed || 0)}, failed=${Number(revision?.counts?.failed || 0)}, pending=${Number(revision?.counts?.pending || 0)}</div>
+                <div><b>Preserved:</b> ${(Array.isArray(revision?.preservedCompletedNodeIds) && revision.preservedCompletedNodeIds.length) ? revision.preservedCompletedNodeIds.join(", ") : "—"}</div>
+                <div><b>Focus:</b> ${(Array.isArray(revision?.focusNodeIds) && revision.focusNodeIds.length) ? revision.focusNodeIds.join(", ") : "—"}</div>
+                <div><b>Graph Before:</b> nodes=${Array.isArray(revision?.graphBefore?.nodes) ? revision.graphBefore.nodes.length : 0}, edges=${Array.isArray(revision?.graphBefore?.edges) ? revision.graphBefore.edges.length : 0}</div>
+                <div><b>Graph After:</b> nodes=${Array.isArray(revision?.graphAfter?.nodes) ? revision.graphAfter.nodes.length : 0}, edges=${Array.isArray(revision?.graphAfter?.edges) ? revision.graphAfter.edges.length : 0}</div>
+              </div>
+            `)}
+          </div>
+        </details>
+
         <div style="display: flex; flex-direction: column; gap: 10px;">
           <h3 style="margin: 0; font-size: 14px; color: var(--color-text-secondary, #8b95a5);">Node Execution</h3>
           ${nodeIds.length === 0 && html`<div style="font-size: 12px; opacity: 0.6;">No node execution data recorded.</div>`}

package/ui/tui/App.js

@@ -0,0 +1,298 @@
+import React, { useMemo, useState } from "react";
+import htm from "htm";
+import { Box, Text, useApp, useInput } from "ink";
+
+import {
+  ANSI_COLORS,
+  COLUMN_WIDTHS,
+  GLYPHS,
+  KEY_BINDINGS,
+  MIN_TERMINAL_SIZE,
+  TAB_ORDER,
+} from "./constants.js";
+import { useWebSocket } from "./useWebSocket.js";
+import { useTasks } from "./useTasks.js";
+import { useWorkflows } from "./useWorkflows.js";
+
+const html = htm.bind(React.createElement);
+
+function clip(value, width) {
+  const text = String(value ?? "");
+  return text.length > width ? `${text.slice(0, Math.max(0, width - 1))}…` : text;
+}
+
+function formatWhen(value) {
+  if (!value) return "-";
+  try {
+    return new Date(value).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
+  } catch {
+    return "-";
+  }
+}
+
+function mergeTasks(baseTasks, liveTasks) {
+  const map = new Map();
+  for (const task of Array.isArray(baseTasks) ? baseTasks : []) {
+    if (task?.id) map.set(task.id, { ...task });
+  }
+  for (const task of Array.isArray(liveTasks) ? liveTasks : []) {
+    if (task?.id) map.set(task.id, { ...(map.get(task.id) || {}), ...task });
+  }
+  return Array.from(map.values());
+}
+
+function renderRow(columns, key, color = undefined, bold = false) {
+  return html`
+    <${Box} key=${key}>
+      ${columns.map((column, index) => html`
+        <${Text}
+          key=${String(index)}
+          color=${color}
+          bold=${bold}
+        >
+          ${String(column)}
+        <//>
+      `)}
+    <//>
+  `;
+}
+
+function renderTable(data) {
+  if (!Array.isArray(data) || data.length === 0) {
+    return html`<${Text} color=${ANSI_COLORS.muted}>No data yet.<//>`;
+  }
+
+  const headers = Object.keys(data[0] || {});
+  const widths = headers.map((header) => {
+    const contentWidth = data.reduce(
+      (max, row) => Math.max(max, String(row?.[header] ?? "").length),
+      String(header).length,
+    );
+    return Math.min(Math.max(contentWidth, String(header).length), COLUMN_WIDTHS[header] || contentWidth);
+  });
+
+  const formatCell = (value, width) => clip(value, width).padEnd(width + 2, " ");
+  const separator = widths.map((width) => `${"-".repeat(width)}  `);
+
+  return html`
+    <${Box} flexDirection="column">
+      ${renderRow(headers.map((header, index) => formatCell(header.toUpperCase(), widths[index])), "header", ANSI_COLORS.accent, true)}
+      ${renderRow(separator, "separator", ANSI_COLORS.muted)}
+      ${data.map((row, rowIndex) => renderRow(
+        headers.map((header, index) => formatCell(row?.[header] ?? "", widths[index])),
+        `row-${rowIndex}`,
+      ))}
+    <//>
+  `;
+}
+
+function StatusHeader({ activeTab, connectionStatus, reconnectPulse, host, port, stats, terminalSize }) {
+  const isConnected = connectionStatus === "connected";
+  const isReconnecting = connectionStatus === "reconnecting";
+  const indicator = isConnected
+    ? GLYPHS.connected
+    : isReconnecting
+      ? (reconnectPulse ? GLYPHS.reconnectingOn : GLYPHS.reconnectingOff)
+      : GLYPHS.disconnected;
+  const indicatorColor = isConnected
+    ? ANSI_COLORS.connected
+    : isReconnecting
+      ? ANSI_COLORS.reconnecting
+      : ANSI_COLORS.disconnected;
+
+  return html`
+    <${Box} flexDirection="column" marginBottom=${1}>
+      <${Box} justifyContent="space-between">
+        <${Text} bold>Bosun TUI<//>
+        <${Text} color=${indicatorColor}>${indicator} ${connectionStatus.toUpperCase()}<//>
+      <//>
+      <${Box} justifyContent="space-between">
+        <${Text} color=${ANSI_COLORS.muted}>WS ${host}:${port} · ${terminalSize.columns}x${terminalSize.rows}<//>
+        <${Text} color=${ANSI_COLORS.muted}>
+          Agents ${stats?.activeAgents ?? 0}/${stats?.maxAgents ?? 0} · Tokens ${stats?.tokensTotal ?? 0}
+        <//>
+      <//>
+      <${Box} marginTop=${1}>
+        ${TAB_ORDER.map((tab) => html`
+          <${Box} key=${tab.id} marginRight=${2}>
+            <${Text} inverse=${tab.id === activeTab} color=${tab.id === activeTab ? undefined : ANSI_COLORS.accent}>
+              [${tab.shortcut.toUpperCase()}]${tab.label.toLowerCase().startsWith(tab.shortcut) ? tab.label.slice(1) : tab.label}
+            <//>
+          <//>
+        `)}
+      <//>
+    <//>
+  `;
+}
+
+function ScreenFrame({ title, subtitle, children }) {
+  return html`
+    <${Box} flexDirection="column">
+      <${Text} bold>${title}<//>
+      <${Text} color=${ANSI_COLORS.muted}>${subtitle}<//>
+      <${Box} marginTop=${1}>${children}<//>
+    <//>
+  `;
+}
+
+export default function App({ config, configDir, host, port, protocol = "ws", initialScreen = "agents", terminalSize }) {
+  const { exit } = useApp();
+  const [activeTab, setActiveTab] = useState(initialScreen);
+  const wsState = useWebSocket({ host, port, configDir, protocol });
+  const taskState = useTasks();
+  const workflowState = useWorkflows(config);
+
+  const combinedTasks = useMemo(
+    () => mergeTasks(taskState.tasks, wsState.tasks),
+    [taskState.tasks, wsState.tasks],
+  );
+
+  useInput((input, key) => {
+    if (input === KEY_BINDINGS.q) {
+      exit();
+      return;
+    }
+
+    if (key.tab) {
+      const index = TAB_ORDER.findIndex((tab) => tab.id === activeTab);
+      const delta = key.shift ? -1 : 1;
+      const nextIndex = (index + delta + TAB_ORDER.length) % TAB_ORDER.length;
+      setActiveTab(TAB_ORDER[nextIndex].id);
+      return;
+    }
+
+    const nextTab = KEY_BINDINGS[String(input || "").toLowerCase()];
+    if (nextTab && TAB_ORDER.some((tab) => tab.id === nextTab)) {
+      setActiveTab(nextTab);
+    }
+  });
+
+  const tooSmall = terminalSize.columns < MIN_TERMINAL_SIZE.columns || terminalSize.rows < MIN_TERMINAL_SIZE.rows;
+
+  const agentsRows = useMemo(() => wsState.sessions.slice(0, 10).map((session) => ({
+    id: clip(session.id, COLUMN_WIDTHS.id),
+    status: clip(session.status, COLUMN_WIDTHS.status),
+    title: clip(session.title || session.taskId || "-", COLUMN_WIDTHS.title),
+    turns: String(session.turnCount ?? 0),
+    updated: formatWhen(session.lastActiveAt),
+  })), [wsState.sessions]);
+
+  const taskRows = useMemo(() => combinedTasks.slice(0, 12).map((task) => ({
+    id: clip(task.id, COLUMN_WIDTHS.id),
+    status: clip(task.status || "todo", COLUMN_WIDTHS.status),
+    priority: clip(task.priority || "medium", COLUMN_WIDTHS.priority),
+    title: clip(task.title || "Untitled task", COLUMN_WIDTHS.title),
+  })), [combinedTasks]);
+
+  const workflowRows = useMemo(() => (workflowState.workflows || []).slice(0, 12).map((workflow) => ({
+    workflow: clip(workflow.name || workflow.id || "workflow", COLUMN_WIDTHS.workflow),
+    source: clip(workflow.source || workflow.file || "configured", 24),
+    enabled: workflow.enabled === false ? "no" : "yes",
+  })), [workflowState.workflows]);
+
+  let body = null;
+  if (tooSmall) {
+    body = html`
+      <${ScreenFrame}
+        title="Terminal too small"
+        subtitle="The Bosun TUI works best in a 120x30 or larger terminal."
+      >
+        <${Text} color=${ANSI_COLORS.warning}>
+          ${GLYPHS.warning} Current size is ${terminalSize.columns}x${terminalSize.rows}. Resize the terminal to continue.
+        <//>
+      <//>
+    `;
+  } else if (activeTab === "agents") {
+    body = html`
+      <${ScreenFrame}
+        title="Agents"
+        subtitle="Live sessions from the Bosun WebSocket bus."
+      >
+        ${renderTable(agentsRows)}
+      <//>
+    `;
+  } else if (activeTab === "tasks") {
+    body = html`
+      <${ScreenFrame}
+        title="Tasks"
+        subtitle=${taskState.loading ? "Loading task store…" : `Showing ${combinedTasks.length} task(s).`}
+      >
+        ${taskState.error ? html`<${Text} color=${ANSI_COLORS.danger}>${taskState.error}<//>` : renderTable(taskRows)}
+      <//>
+    `;
+  } else if (activeTab === "logs") {
+    body = html`
+      <${ScreenFrame}
+        title="Logs"
+        subtitle="Latest streamed lines from the Bosun bus."
+      >
+        ${wsState.logs.length
+          ? html`${wsState.logs.slice(0, 12).map((entry, index) => html`
+              <${Text} key=${String(index)}>
+                ${clip(entry?.timestamp || "--:--", 8)} ${clip((entry?.level || "info").toUpperCase(), 5)} ${clip(entry?.line || entry?.raw || "", 100)}
+              <//>
+            `)}`
+          : html`<${Text} color=${ANSI_COLORS.muted}>No log lines streamed yet.<//>`}
+      <//>
+    `;
+  } else if (activeTab === "workflows") {
+    body = html`
+      <${ScreenFrame}
+        title="Workflows"
+        subtitle=${workflowState.loading ? "Loading configured workflows…" : `Loaded ${workflowState.workflows.length} workflow(s).`}
+      >
+        ${workflowState.error ? html`<${Text} color=${ANSI_COLORS.danger}>${workflowState.error}<//>` : renderTable(workflowRows)}
+      <//>
+    `;
+  } else if (activeTab === "telemetry") {
+    body = html`
+      <${ScreenFrame}
+        title="Telemetry"
+        subtitle="Live monitor counters and reconnect health."
+      >
+        <${Text}>Connection: ${wsState.connectionStatus}<//>
+        <${Text}>Reconnects: ${wsState.reconnectCount}<//>
+        <${Text}>Tokens In/Out: ${wsState.stats?.tokensIn ?? 0}/${wsState.stats?.tokensOut ?? 0}<//>
+        <${Text}>Throughput TPS: ${wsState.stats?.throughputTps ?? 0}<//>
+      <//>
+    `;
+  } else if (activeTab === "settings") {
+    body = html`
+      <${ScreenFrame}
+        title="Settings"
+        subtitle="Resolved local Bosun runtime settings."
+      >
+        <${Text}>Config Dir: ${configDir}<//>
+        <${Text}>WS Host: ${host}<//>
+        <${Text}>WS Port: ${port}<//>
+        <${Text}>Workspace: ${config?.activeWorkspace || "-"}<//>
+      <//>
+    `;
+  } else {
+    body = html`
+      <${ScreenFrame}
+        title="Help"
+        subtitle="Keyboard shortcuts for the Bosun TUI."
+      >
+        <${Text}>A/T/L/W/X/S/? switch screens.<//>
+        <${Text}>Tab and Shift+Tab cycle screens.<//>
+        <${Text}>Q quits the TUI.<//>
+      <//>
+    `;
+  }
+
+  return html`
+    <${Box} flexDirection="column">
+      <${StatusHeader}
+        activeTab=${activeTab}
+        connectionStatus=${wsState.connectionStatus}
+        reconnectPulse=${wsState.reconnectPulse}
+        host=${host}
+        port=${port}
+        stats=${wsState.stats}
+        terminalSize=${terminalSize}
+      />
+      ${body}
+    <//>
+  `;
+}