@circuitwall/jarela 2.2.1 → 2.3.0

package/components/chat/ChatView.tsx

@@ -6,15 +6,18 @@ import { useSSE } from "@/hooks/useSSE";
 import { useMessageFilters } from "@/hooks/useMessageFilters";
 import { useAppContext } from "@/contexts/AppContext";
 import { useTrackLoading, useActivityWhile } from "@/lib/ui/loading";
+import { pushToast } from "@/lib/ui/toasts";
+import { pushErrorToast } from "@/lib/ui/error-report";
 import { ApprovalsBanner } from "@/components/proposals/ApprovalsBanner";
 import { AuthErrorBanner } from "./AuthErrorBanner";
 import { InputBar } from "./InputBar";
 import { MessageList } from "./MessageList";
-import { applyThreadMeta, makeQueuedId, parseWarmSummaryTopics } from "./chat-helpers";
+import { applyThreadMeta, compactionOutcomeToast, makeQueuedId, parseWarmSummaryTopics, type CompactionOutcome } from "./chat-helpers";
 import { useChatErrorReporting } from "./useChatErrorReporting";
 import { useChatQueue, type ChatQueueApi } from "./useChatQueue";
 import { useThreadCrossDeviceSync } from "./useThreadCrossDeviceSync";
 import { useThreadData } from "./useThreadData";
+import { useThreadActivity } from "./useThreadActivity";
 import { useUserProfileAndAgent } from "./useUserProfileAndAgent";
 import { composerPlaceholder, finalizeRunFromServer } from "./chat-run-utils";
 import { useChatSubmitHandlers } from "./useChatSubmitHandlers";
@@ -84,11 +87,27 @@ export function ChatView({ threadId, agentId, sessionLoading, sessionError, onMe
   attachRef.current = sse.attach;
   clearStreamingRef.current = sse.clearStreamingContent;
   clearToolEventsRef.current = sse.clearToolEvents;
+  // `compacting` lives in this component, which remounts per agent; the
+  // server flag keeps a /compact started before an agent switch visible.
+  const sessionCompacting = compacting || thread.manualCompactionPending;
+
+  const activity = useThreadActivity({
+    threadId,
+    attach: stableAttach,
+    isLive: sse.isLive,
+    lastSettledAt: sse.lastSettledAt,
+    metaApplier: thread.metaApplier,
+  });
+  // Run phases come through the attached stream; background compaction
+  // outside a run has no stream, so label it from the polled activity.
+  const backgroundCompaction = !sse.streaming && !sessionCompacting ? activity?.compaction?.kind ?? null : null;
 
   useChatErrorReporting({ sessionError, streamError: sse.error, authError: sse.authError, agentId, threadId });
 
   const streamingRef = useRef(false);
   streamingRef.current = sse.streaming;
+  const currentThreadIdRef = useRef(threadId);
+  currentThreadIdRef.current = threadId;
 
   // Auto compaction starts server-side during a run; poll so the banner shows live.
   useEffect(() => {
@@ -117,11 +136,14 @@ export function ChatView({ threadId, agentId, sessionLoading, sessionError, onMe
 
   useTrackLoading(!!sessionLoading);
   useTrackLoading(sse.streaming);
-  useTrackLoading(compacting);
+  useTrackLoading(sessionCompacting);
   useTrackLoading(thread.loadingMore);
   useTrackLoading(thread.messagesLoading);
   useTrackLoading(agentConfigLoading);
 
+  useActivityWhile(sessionCompacting, "Compacting session…");
+  useActivityWhile(backgroundCompaction === "auto", "Compacting earlier messages…");
+  useActivityWhile(backgroundCompaction === "refresh", "Updating summary…");
   useActivityWhile(thread.messagesLoading, "Loading chat history…");
   useActivityWhile(agentConfigLoading, "Loading agent…");
   useActivityWhile(profileLoading, "Loading profile…");
@@ -197,16 +219,32 @@ export function ChatView({ threadId, agentId, sessionLoading, sessionError, onMe
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [threadId]);
 
-  const queue = useChatQueue({ threadId, streaming: sse.streaming, compacting, launchRun });
+  const queue = useChatQueue({ threadId, streaming: sse.streaming, compacting: sessionCompacting, launchRun });
   queueApiRef.current = queue;
   drainQueueRef.current = queue.drainQueueRef.current;
 
   async function handleCompact() {
     if (!agentId) return;
+    const notifyCompaction = (result: CompactionOutcome) => {
+      const toast = compactionOutcomeToast(result);
+      pushToast({
+        ...toast,
+        source: "system",
+        sourceLabel: "Chat",
+        agent_id: agentId,
+        thread_id: threadId,
+        ttl: 5000,
+        dedupeKey: `compact:${agentId}`,
+      });
+    };
     setCompacting(true);
     try {
       const result = await api.agents.compact(agentId, { resetContext: true });
-      if (result.compacted) {
+      // The thread may have changed while compaction ran; never apply its
+      // result to a different thread's view.
+      const compactedThreadId = threadId;
+      const stillCurrent = () => compactedThreadId !== null && currentThreadIdRef.current === compactedThreadId;
+      if (result.compacted && compactedThreadId !== null && stillCurrent()) {
         // Server moved the hot/warm pin to just after the last existing
         // message and persisted the warm summary. Mirror that in-place so
         // the warm card shows the fresh summary without wiping the visible
@@ -218,16 +256,19 @@ export function ChatView({ threadId, agentId, sessionLoading, sessionError, onMe
         thread.metaApplier.setWarmSummary(result.warm_summary ?? null);
         thread.metaApplier.setWarmSummaryBefore(result.warm_summary_before ?? null);
         thread.metaApplier.setWarmSummaryBeforeSeq(result.warm_summary_before_seq ?? null);
-        thread.metaApplier.setWarmSummaryBeforeSeq(result.warm_summary_before_seq ?? null);
         thread.metaApplier.setWarmSummaryComputedAt(result.warm_summary_computed_at ?? null);
         thread.metaApplier.setWarmSummarySourceMessages(result.warm_summary_source_messages ?? null);
         thread.metaApplier.setWarmSummarySourceChars(result.warm_summary_source_chars ?? null);
         thread.metaApplier.setWarmSummaryTopics?.(parseWarmSummaryTopics(result.warm_summary_topics));
-      } else {
-        thread.addNotice("Nothing to compact yet — send some messages first.");
+        // The compact response carries only the chat recap; channel recaps
+        // (bridge, watcher, scheduled task) come with the thread metadata.
+        void api.threads.get(compactedThreadId, { limit: 1 })
+          .then((d) => { if (stillCurrent()) applyThreadMeta(thread.metaApplier, d); })
+          .catch(() => { /* best-effort */ });
       }
+      notifyCompaction(result);
     } catch (err) {
-      thread.addNotice(`Compaction failed: ${String(err)}`);
+      pushErrorToast({ title: "Compaction failed", error: err, context: { panel: "chat", action: "compact", agent_id: agentId } });
     } finally {
       setCompacting(false);
       queue.drainQueueRef.current();
@@ -260,7 +301,6 @@ export function ChatView({ threadId, agentId, sessionLoading, sessionError, onMe
         threadId={threadId}
         messages={thread.messages}
         steeredSegments={sse.steeredSegments}
-        notices={thread.notices}
         agentConfig={agentConfig}
         userProfile={userProfile}
         // streamingContent stays visible past `streaming=false` so the bubble
@@ -287,8 +327,9 @@ export function ChatView({ threadId, agentId, sessionLoading, sessionError, onMe
         warmSummarySourceMessages={thread.warmSummarySourceMessages}
         warmSummarySourceChars={thread.warmSummarySourceChars}
         warmSummaryTopics={thread.warmSummaryTopics}
+        warmChannelSummaries={thread.warmChannelSummaries}
         warmSummaryPending={thread.warmSummaryPending}
-        compactionPending={thread.compactionPending || compacting}
+        compactionPending={thread.compactionPending || sessionCompacting}
         onSetContextPin={thread.setContextPin}
         streaming={sse.streaming}
         contextWindowTokens={thread.contextWindowTokens}
@@ -313,7 +354,7 @@ export function ChatView({ threadId, agentId, sessionLoading, sessionError, onMe
         onVoiceTranscript={handleVoiceTranscript}
         disabled={!agentId}
         placeholder={composerPlaceholder({
-          compacting,
+          compacting: sessionCompacting,
           sessionLoading: !!sessionLoading,
           streaming: sse.streaming,
         })}

package/components/chat/ContextBoundary.test.tsx

@@ -1,7 +1,7 @@
 // @vitest-environment jsdom
 import { describe, expect, it } from "vitest";
 import { fireEvent, render, screen } from "@testing-library/react";
-import { WarmSummaryCard } from "./ContextBoundary";
+import { topicsFromSummarySections, WarmSummaryCard } from "./ContextBoundary";
 import type { SummaryTopicSegment } from "@/api/types";
 
 const topics: SummaryTopicSegment[] = [
@@ -66,4 +66,71 @@ describe("WarmSummaryCard topic preview", () => {
     expect(screen.getByText("Flat prose fallback.")).toBeTruthy();
     expect(screen.queryByRole("button", { name: /Pricing extraction/ })).toBeNull();
   });
+
+  it("groups a sectioned summary without stored topics into collapsed topic rows", () => {
+    const legacy = [
+      "<!-- jarela:warm-scope=foreground -->",
+      "--- Warm context summary ---",
+      "Compressed recap of recent messages immediately before the hot window:",
+      "## Context",
+      "Weighing **three offers** against each other.",
+      "## User facts & preferences",
+      "- Will not relocate",
+      "- Wants numerical answers",
+    ].join("\n");
+    render(<WarmSummaryCard olderCount={46} summary={legacy} summaryBeforeSeq={10} hotSinceSeq={10} computedAt={null} streaming={false} topics={null} />);
+
+    expect(screen.queryByText(/jarela:warm-scope/)).toBeNull();
+    expect(screen.queryByText(/Warm context summary/)).toBeNull();
+    const context = screen.getByRole("button", { name: /^Context/ });
+    expect(context.getAttribute("aria-expanded")).toBe("false");
+    expect(screen.getByRole("button", { name: /User facts & preferences/ })).toBeTruthy();
+    expect(screen.getByText("three offers").tagName).toBe("STRONG");
+    expect(screen.queryByRole("button", { name: /Show more/ })).toBeNull();
+
+    fireEvent.click(screen.getByRole("button", { name: /User facts & preferences/ }));
+    expect(screen.getAllByText("Will not relocate")).toHaveLength(1);
+  });
+});
+
+describe("WarmSummaryCard automation-only boundary", () => {
+  const bridgeRecap = {
+    channel: "bridge",
+    summary: "<!-- jarela:warm-scope=bridge -->\nRelayed **deployment alerts** from the ops channel.",
+    computed_at: "2026-10-14T09:30:00.000Z",
+    topics: null,
+  };
+
+  it("shows the bridge recap instead of a never-arriving chat summary", () => {
+    render(<WarmSummaryCard olderCount={50} summary="" summaryBeforeSeq={10} hotSinceSeq={10} computedAt="2026-10-14T09:30:00.000Z" streaming={false} topics={null} channelSummaries={[bridgeRecap]} />);
+
+    expect(screen.getByText("Bridge")).toBeTruthy();
+    expect(screen.getByRole("button", { name: /Recap/ }).getAttribute("aria-expanded")).toBe("false");
+    expect(screen.getByText("deployment alerts").tagName).toBe("STRONG");
+    expect(screen.queryByText(/jarela:warm-scope/)).toBeNull();
+    expect(screen.queryByText(/Summary will appear/)).toBeNull();
+  });
+
+  it("says nothing needed summarising when the committed boundary has no recaps at all", () => {
+    render(<WarmSummaryCard olderCount={3} summary="" summaryBeforeSeq={10} hotSinceSeq={10} computedAt="2026-10-14T09:30:00.000Z" streaming={false} topics={null} />);
+    expect(screen.getByText("No earlier chat messages needed summarising.")).toBeTruthy();
+    expect(screen.queryByText(/Summary will appear/)).toBeNull();
+  });
+
+  it("keeps the placeholder while the boundary has no committed summary yet", () => {
+    render(<WarmSummaryCard olderCount={3} summary={null} summaryBeforeSeq={null} hotSinceSeq={10} computedAt={null} streaming={false} topics={null} />);
+    expect(screen.getByText("Summary will appear after your next reply.")).toBeTruthy();
+  });
+});
+
+describe("topicsFromSummarySections", () => {
+  it("keeps unstructured or single-section summaries as prose", () => {
+    expect(topicsFromSummarySections("Just a short recap.")).toBeNull();
+    expect(topicsFromSummarySections("## Only\nOne section.")).toBeNull();
+  });
+
+  it("keeps intro text before the first heading as an overview section", () => {
+    const sections = topicsFromSummarySections("Intro line.\n## Decisions\n- Chose A");
+    expect(sections?.map((s) => [s.title, s.recap])).toEqual([["Overview", "Intro line."], ["Decisions", "- Chose A"]]);
+  });
 });

package/components/chat/ContextBoundary.tsx

@@ -11,7 +11,7 @@ import ReactMarkdown from "react-markdown";
 import { StatusDot } from "@/components/ui/StatusDot";
 import { MetaRow } from "@/components/ui/MetaRow";
 import { CollapseChevron } from "@/components/ui/CollapseChevron";
-import type { SummaryTopicSegment } from "@/api/types";
+import type { SummaryTopicSegment, WarmChannelSummary } from "@/api/types";
 
 interface WarmSummaryCardProps {
   /** Number of messages older than the boundary that the summary covers. */
@@ -26,8 +26,16 @@ interface WarmSummaryCardProps {
   streaming: boolean;
   /** Per-topic segmentation of the same warm range, if the summarizer returned one. */
   topics?: SummaryTopicSegment[] | null;
+  /** Automation-channel recaps (bridge, watcher, scheduled task) at this boundary. */
+  channelSummaries?: WarmChannelSummary[];
 }
 
+const CHANNEL_LABELS: Record<string, string> = {
+  bridge: "Bridge",
+  watcher: "Watchers",
+  scheduled_task: "Scheduled tasks",
+};
+
 export function WarmSummaryCard({
   olderCount,
   summary,
@@ -36,19 +44,25 @@ export function WarmSummaryCard({
   computedAt,
   streaming,
   topics,
+  channelSummaries = [],
 }: WarmSummaryCardProps) {
   const [expanded, setExpanded] = useState(false);
-  const fresh = !!summary && hotSinceSeq != null && summaryBeforeSeq === hotSinceSeq;
+  const committed = hotSinceSeq != null && summaryBeforeSeq === hotSinceSeq;
+  const fresh = !!summary && committed;
   const stale = !!summary && !fresh;
   const computing = stale && streaming;
-  const summaryTopics = summary && topics && topics.length > 0 ? topics : null;
+  // Summaries stored before topic segmentation still read as topics: their
+  // markdown sections render through the same collapsible rows.
+  const summaryTopics = summary
+    ? (topics && topics.length > 0 ? topics : topicsFromSummarySections(summary))
+    : null;
 
   return (
     <div
       className={[
         "relative my-4 rounded-2xl border bg-gradient-to-br shadow-sm",
         "from-accent/[0.06] via-surface-2 to-surface-2",
-        fresh ? "border-accent/30" : "border-border",
+        fresh || committed ? "border-accent/30" : "border-border",
       ].join(" ")}
     >
       <div className="flex items-center gap-2 px-4 pt-3 pb-1.5">
@@ -82,6 +96,10 @@ export function WarmSummaryCard({
           >
             <ReactMarkdown>{stripWarmHeader(summary!)}</ReactMarkdown>
           </div>
+        ) : !summary && committed ? (
+          channelSummaries.length === 0 && (
+            <div className="text-xs text-fg-faint italic">No earlier chat messages needed summarising.</div>
+          )
         ) : !summary ? (
           <div className="flex items-center gap-2 text-xs text-fg-faint italic">
             {computing && (
@@ -95,6 +113,10 @@ export function WarmSummaryCard({
           </div>
         ) : null}
 
+        {channelSummaries.map((channel) => (
+          <ChannelSummarySection key={channel.channel} channel={channel} />
+        ))}
+
         {stale && (
           <div className="mt-2 inline-flex items-center gap-2 text-[11px] text-fg-faint">
             {computing ? <StatusDot tone="accent" size="sm" pulse /> : <StatusDot tone="neutral" size="sm" />}
@@ -121,6 +143,25 @@ export function WarmSummaryCard({
   );
 }
 
+function ChannelSummarySection({ channel }: { channel: WarmChannelSummary }) {
+  const topics = channel.topics && channel.topics.length > 0
+    ? channel.topics
+    : topicsFromSummarySections(channel.summary)
+      ?? [{ title: "Recap", start_at: "", end_at: "", recap: stripWarmHeader(channel.summary), facts: [] }];
+  return (
+    <div className="mt-2">
+      <div className="mb-1 text-[9px] uppercase tracking-wide text-fg-faint">
+        {CHANNEL_LABELS[channel.channel] ?? channel.channel}
+      </div>
+      <div className="flex flex-col gap-1">
+        {topics.map((topic, i) => (
+          <TopicSegmentRow key={`${channel.channel}-${topic.title}-${i}`} topic={topic} />
+        ))}
+      </div>
+    </div>
+  );
+}
+
 function TopicSegmentRow({ topic }: { topic: SummaryTopicSegment }) {
   const [open, setOpen] = useState(false);
   const range = formatTopicRange(topic.start_at, topic.end_at);
@@ -130,9 +171,14 @@ function TopicSegmentRow({ topic }: { topic: SummaryTopicSegment }) {
         <CollapseChevron open={open} size={9} />
         <span className="font-medium text-fg-muted truncate">{topic.title}</span>
         {range && <span className="text-fg-faint shrink-0">· {range}</span>}
+        {typeof topic.message_count === "number" && topic.message_count > 0 && (
+          <span className="text-fg-faint shrink-0">
+            · {topic.message_count} {topic.message_count === 1 ? "msg" : "msgs"}
+          </span>
+        )}
         {topic.facts.length > 0 && (
           <span className="ml-auto shrink-0 text-[9px] uppercase tracking-wide text-accent">
-            {topic.facts.length} {topic.facts.length === 1 ? "fact" : "facts"} saved
+            {topic.facts.length} memorized
           </span>
         )}
       </MetaRow>
@@ -149,13 +195,17 @@ function TopicSegmentRow({ topic }: { topic: SummaryTopicSegment }) {
             </div>
           )}
           {topic.facts.length > 0 && (
-            <ul className="space-y-0.5">
-              {topic.facts.map((fact, i) => (
-                <li key={`${fact.subject}-${i}`} className="text-[11px] text-fg-faint">
-                  <span className="font-medium text-fg-muted">{fact.subject}:</span> {fact.content}
-                </li>
-              ))}
-            </ul>
+            <div>
+              <div className="text-[9px] uppercase tracking-wide text-fg-faint">Memorized</div>
+              <ul className="space-y-0.5">
+                {topic.facts.map((fact, i) => (
+                  <li key={`${fact.key ?? fact.subject}-${i}`} className="text-[11px] text-fg-faint">
+                    <span className="font-medium text-fg-muted">{fact.subject}:</span> {fact.content}
+                    {fact.key && <code className="ml-1 text-[10px] text-fg-faint">{fact.key}</code>}
+                  </li>
+                ))}
+              </ul>
+            </div>
           )}
         </div>
       )}
@@ -313,11 +363,40 @@ function formatBytes(n: number): string {
 // awkwardly inside a card that already has its own header. Strip them.
 function stripWarmHeader(raw: string): string {
   return raw
+    .replace(/\r\n/g, "\n")
+    .replace(/^\s*(<!--[\s\S]*?-->\s*)+/, "")
     .replace(/^--- Warm context summary ---\n/, "")
-    .replace(/^Compressed recap of earlier messages outside the hot window:\n/, "")
+    .replace(/^Compressed recap of [^\n]*:\n/, "")
     .trimStart();
 }
 
+/**
+ * Splits a markdown summary into topic segments at its headings. Returns
+ * null when there are fewer than two sections, so short or unstructured
+ * summaries keep the plain prose rendering.
+ */
+export function topicsFromSummarySections(raw: string): SummaryTopicSegment[] | null {
+  const sections: SummaryTopicSegment[] = [];
+  let title: string | null = null;
+  let body: string[] = [];
+  const flush = () => {
+    const recap = body.join("\n").trim();
+    if (title !== null || recap) sections.push({ title: title ?? "Overview", start_at: "", end_at: "", recap, facts: [] });
+  };
+  for (const line of stripWarmHeader(raw).split("\n")) {
+    const heading = /^#{1,3}\s+(.+?)\s*#*\s*$/.exec(line);
+    if (heading) {
+      flush();
+      title = heading[1];
+      body = [];
+    } else {
+      body.push(line);
+    }
+  }
+  flush();
+  return sections.length >= 2 ? sections : null;
+}
+
 function summaryLong(raw: string): boolean {
   // Heuristic: more than 6 lines or > 600 chars after the header strip.
   const stripped = stripWarmHeader(raw);

package/components/chat/MessageList.test.tsx

@@ -584,4 +584,35 @@ describe("MessageList conversation focus", () => {
     fireEvent.click(enabledButton);
     expect(scrollIntoView).toHaveBeenCalled();
   });
+
+  it("keeps a near-bottom boundary locate from snapping back to the bottom", () => {
+    const messages = [
+      mkMessage("m1", "user", "older", "2026-08-09T10:00:00.000Z"),
+      mkMessage("m2", "assistant", "newer", "2026-08-09T10:00:01.000Z"),
+      mkMessage("m3", "assistant", "latest", "2026-08-09T10:00:02.000Z"),
+    ];
+    const props = { threadId: "thread-1", onSetContextPin: vi.fn(), hotSinceSeq: 2 };
+    const { container, rerender } = render(<MessageList {...props} messages={messages} />);
+
+    const scroller = container.querySelector(".panel-scrollbar") as HTMLDivElement;
+    Object.defineProperty(scroller, "scrollHeight", { configurable: true, value: 2000 });
+    Object.defineProperty(scroller, "clientHeight", { configurable: true, value: 500 });
+    Object.defineProperty(scroller, "scrollTop", { configurable: true, writable: true, value: 1500 });
+    fireEvent.scroll(scroller);
+
+    // Simulate the first smooth-scroll frame: still within 100px of the bottom.
+    const boundaryEl = document.querySelector("[data-focus-boundary='1']") as HTMLElement;
+    boundaryEl.scrollIntoView = vi.fn(() => {
+      scroller.scrollTop = 1450;
+      fireEvent.scroll(scroller);
+    });
+
+    fireEvent.click(screen.getByRole("button", { name: /filters & focus/i }));
+    fireEvent.click(screen.getByRole("button", { name: "Locate boundary line" }));
+    expect(boundaryEl.scrollIntoView).toHaveBeenCalledWith({ behavior: "smooth", block: "center" });
+    expect(boundaryEl.classList.contains("jarela-deep-link-flash")).toBe(true);
+
+    rerender(<MessageList {...props} messages={[...messages]} />);
+    expect(scroller.scrollTop).toBe(1450);
+  });
 });

package/components/chat/MessageList.tsx

@@ -1,21 +1,17 @@
 "use client";
 import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { Brain, ChevronRight, Hourglass, X, ArrowDown, Eye, EyeOff } from "lucide-react";
-import type { AgentConfig, AutomationActivityMetadata, ContentPart, Message, SummaryTopicSegment, UserProfile } from "@/api/types";
+import type { AgentConfig, AutomationActivityMetadata, ContentPart, Message, SummaryTopicSegment, UserProfile, WarmChannelSummary } from "@/api/types";
 import { ToolList, type ToolEvent } from "./ToolList";
 import { MessageBubble } from "./MessageBubble";
 import { ContextBoundaryDivider, WarmSummaryCard } from "./ContextBoundary";
+import { WorkflowStepRetryContext, workflowStepRetryMessage, type WorkflowStepRetryRequest } from "./workflow-step-retry";
 import { MESSAGE_FILTER_KEYS, type MessageFilterKey } from "@/hooks/useMessageFilters";
 import { CollapseChevron } from "@/components/ui/CollapseChevron";
 import { MetaRow } from "@/components/ui/MetaRow";
 import { StatusDot } from "@/components/ui/StatusDot";
 import { Dialog } from "@/components/ui/Dialog";
 
-interface SystemNotice {
-  id: string;
-  text: string;
-}
-
 interface QueuedMessageView {
   id: string;
   text: string;
@@ -31,7 +27,6 @@ interface Props {
   threadId?: string | null;
   messages: Message[];
   steeredSegments?: SteeredSegment[];
-  notices?: SystemNotice[];
   agentConfig?: AgentConfig | null;
   userProfile?: UserProfile | null;
   streamingContent?: string;
@@ -53,6 +48,8 @@ interface Props {
   warmSummarySourceMessages?: number | null;
   warmSummarySourceChars?: number | null;
   warmSummaryTopics?: SummaryTopicSegment[] | null;
+  /** Automation-channel recaps committed at the current boundary. */
+  warmChannelSummaries?: WarmChannelSummary[];
   warmSummaryPending?: boolean;
   /** An automatic compaction is summarising earlier messages right now. */
   compactionPending?: boolean;
@@ -78,8 +75,9 @@ interface Props {
 const ALL_FILTERS_SHOWN: Record<MessageFilterKey, boolean> = Object.fromEntries(
   MESSAGE_FILTER_KEYS.map((k) => [k, true]),
 ) as Record<MessageFilterKey, boolean>;
+const NO_CHANNEL_SUMMARIES: WarmChannelSummary[] = [];
 
-export function MessageList({ threadId, messages, steeredSegments, notices, agentConfig, userProfile, streamingContent, thinkingContent, toolEvents, hasMore, loadingMore, onLoadMore, queuedMessages, onRemoveQueued, hotSinceSeq, warmSummary, warmSummaryBeforeSeq, warmSummaryComputedAt, warmSummarySourceMessages, warmSummarySourceChars, warmSummaryTopics, warmSummaryPending = false, compactionPending = false, onSetContextPin, streaming, contextWindowTokens, onRetryMessage, filters = ALL_FILTERS_SHOWN, onToggleFilter: toggle = () => {}, onResetFilters: reset = () => {} }: Props) {
+export function MessageList({ threadId, messages, steeredSegments, agentConfig, userProfile, streamingContent, thinkingContent, toolEvents, hasMore, loadingMore, onLoadMore, queuedMessages, onRemoveQueued, hotSinceSeq, warmSummary, warmSummaryBeforeSeq, warmSummaryComputedAt, warmSummarySourceMessages, warmSummarySourceChars, warmSummaryTopics, warmChannelSummaries = NO_CHANNEL_SUMMARIES, warmSummaryPending = false, compactionPending = false, onSetContextPin, streaming, contextWindowTokens, onRetryMessage, filters = ALL_FILTERS_SHOWN, onToggleFilter: toggle = () => {}, onResetFilters: reset = () => {} }: Props) {
   const hostRef = useRef<HTMLDivElement>(null);
   const maskRegionRef = useRef<HTMLDivElement>(null);
   const scrollRef = useRef<HTMLDivElement>(null);
@@ -104,6 +102,13 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
   const [pendingHotSinceSeq, setPendingHotSinceSeq] = useState<number | null>(null);
   const [topControlsOpen, setTopControlsOpen] = useState(false);
   const [summaryPopoverOpen, setSummaryPopoverOpen] = useState(false);
+
+  const retryWorkflowStep = useMemo(
+    () => onRetryMessage
+      ? (request: WorkflowStepRetryRequest) => onRetryMessage(workflowStepRetryMessage(request), [])
+      : null,
+    [onRetryMessage],
+  );
 
   // Apply category filter. Messages with no `category` (NULL = ordinary
   // chat) are always shown; tagged messages are gated by their toggle.
@@ -503,9 +508,15 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
       ? nextHotCount < currentHotCount
       : false;
   const hasWarmSummary = !!warmSummary;
+  // A committed boundary whose chat range had nothing to summarise (e.g. a
+  // bridge-only agent): the recap, if any, lives in the channel summaries.
+  const summaryCommittedEmpty = !hasWarmSummary
+    && effectiveHotSinceSeq !== null
+    && warmSummaryBeforeSeq === effectiveHotSinceSeq;
   const summaryFresh = hasWarmSummary
     && effectiveHotSinceSeq !== null
     && warmSummaryBeforeSeq === effectiveHotSinceSeq;
+  const summaryReady = summaryFresh || summaryCommittedEmpty;
   const summaryUpdating = hasWarmSummary && !summaryFresh && !!streaming;
   const summaryStale = hasWarmSummary && !summaryFresh && !summaryUpdating;
 
@@ -593,10 +604,25 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
     boundaryAnchorRef.current = null;
   }, []);
 
+  // While a programmatic smooth scroll (locate boundary, deep link) animates
+  // away from the bottom, its first frames are still "near bottom". Without
+  // this lock, scroll sync re-arms bottom-follow and the post-render snap
+  // cancels the animation, so the target is never reached.
+  const programmaticScrollUntilRef = useRef(0);
   const syncScrollButton = useCallback((el: HTMLDivElement) => {
     const isAtBottom = el.scrollHeight - el.scrollTop - el.clientHeight < 100;
-    atBottomRef.current = isAtBottom;
-    setShowScrollButton(!isAtBottom && hasScrollTarget);
+    const locked = Date.now() < programmaticScrollUntilRef.current;
+    atBottomRef.current = isAtBottom && !locked;
+    setShowScrollButton(!atBottomRef.current && hasScrollTarget);
+  }, [hasScrollTarget]);
+
+  const scrollTargetIntoView = useCallback((target: HTMLElement) => {
+    programmaticScrollUntilRef.current = Date.now() + PROGRAMMATIC_SCROLL_LOCK_MS;
+    atBottomRef.current = false;
+    setShowScrollButton(hasScrollTarget);
+    target.scrollIntoView({ behavior: "smooth", block: "center" });
+    target.classList.add("jarela-deep-link-flash");
+    window.setTimeout(() => target.classList.remove("jarela-deep-link-flash"), 1600);
   }, [hasScrollTarget]);
 
   // Anchor for older-message pagination. When the user scrolls near the top
@@ -715,11 +741,7 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
         const safe = id.replace(/"/g, '\\"');
         const el = root.querySelector(`[data-message-id="${safe}"]`) as HTMLElement | null;
         if (!el) return;
-        atBottomRef.current = false;
-        setShowScrollButton(hasScrollTarget);
-        el.scrollIntoView({ behavior: "smooth", block: "center" });
-        el.classList.add("jarela-deep-link-flash");
-        setTimeout(() => el.classList.remove("jarela-deep-link-flash"), 1600);
+        scrollTargetIntoView(el);
         // Strip the hash so the next streaming message / list-length change
         // doesn't yank the view back to this anchor. replaceState avoids
         // triggering a hashchange event (which would re-enter this handler).
@@ -730,7 +752,7 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
     scrollToHashTarget();
     window.addEventListener("hashchange", scrollToHashTarget);
     return () => window.removeEventListener("hashchange", scrollToHashTarget);
-  }, [messages.length, hasScrollTarget]);
+  }, [messages.length, scrollTargetIntoView]);
 
   // Handle orientation changes and resizes to maintain scroll position
   useEffect(() => {
@@ -765,12 +787,11 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
       ? document.getElementById(`context-boundary-${effectiveHotSinceSeq}`)
       : root.querySelector("[data-focus-boundary='1']") as HTMLElement | null;
     if (!boundary) return;
-    atBottomRef.current = false;
-    setShowScrollButton(hasScrollTarget);
-    boundary.scrollIntoView({ behavior: "smooth", block: "center" });
+    scrollTargetIntoView(boundary);
   }
 
   return (
+    <WorkflowStepRetryContext.Provider value={retryWorkflowStep}>
     <div ref={hostRef} className="flex-1 flex flex-col min-h-0 relative">
       {visibleMessages.length > 0 && (
         <div className="shrink-0 px-4 pt-[calc(var(--app-safe-top)+3rem)] pb-1">
@@ -1014,13 +1035,6 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
           ))}
         </div>
       )}
-      {notices?.map((n) => (
-        <div key={n.id} className="flex justify-center my-3">
-          <span className="text-xs italic text-fg-faint bg-surface-2 px-3 py-1 rounded-full border border-border">
-            {n.text}
-          </span>
-        </div>
-      ))}
         </div>
 
         <div
@@ -1079,7 +1093,7 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
                 className={[
                   "text-[10px] px-1.5 py-px rounded border inline-flex items-center gap-1",
                   summaryUpdating ? "border-accent/40 bg-accent/10 text-accent" :
-                  summaryFresh ? "border-emerald-500/30 bg-emerald-500/10 text-emerald-600 dark:text-emerald-400" :
+                  summaryReady ? "border-emerald-500/30 bg-emerald-500/10 text-emerald-600 dark:text-emerald-400" :
                   summaryStale ? "border-amber-500/30 bg-amber-500/10 text-amber-700 dark:text-amber-400" :
                   "border-border bg-surface-2 text-fg-faint",
                 ].join(" ")}
@@ -1088,7 +1102,7 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
                   <span className="h-2 w-2 rounded-full bg-accent animate-pulse" aria-label="Summary updating" />
                 )}
                 <span>
-                  {summaryUpdating ? "updating" : summaryFresh ? "ready" : summaryStale ? "needs refresh" : "pending"}
+                  {summaryUpdating ? "updating" : summaryReady ? "ready" : summaryStale ? "needs refresh" : "pending"}
                 </span>
               </span>
             </div>
@@ -1096,6 +1110,10 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
               <p className="text-[11px] text-fg-faint">
                 {summaryFresh
                   ? "Showing the latest summary for messages above the boundary line."
+                  : summaryCommittedEmpty
+                  ? (warmChannelSummaries.length > 0
+                    ? "No chat messages above the boundary line; automation activity there is summarised below."
+                    : "Nothing above the boundary line needed summarising.")
                   : summaryStale
                   ? "This summary is from an older focus and will refresh after the next reply."
                   : "No summary yet. It will appear after the next reply."}
@@ -1109,6 +1127,7 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
               computedAt={warmSummaryComputedAt ?? null}
               streaming={!!streaming}
               topics={warmSummaryTopics ?? null}
+              channelSummaries={warmChannelSummaries}
             />
           </div>
         </Dialog>
@@ -1157,6 +1176,7 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
         </div>
       </Dialog>
     </div>
+    </WorkflowStepRetryContext.Provider>
   );
 }
 
@@ -1165,6 +1185,7 @@ export function MessageList({ threadId, messages, steeredSegments, notices, agen
 // activeChannels + lib/agents/prepare/history-window.ts). The rest
 // (extension, page_capture, synthetic, tool_use, thinking) are display-only.
 const CHANNEL_SCOPED_FILTER_KEYS = new Set<MessageFilterKey>(["scheduled_task", "watcher", "bridge"]);
+const PROGRAMMATIC_SCROLL_LOCK_MS = 1500;
 
 const CHIP_LABELS: Record<MessageFilterKey, string> = {
   scheduled_task: "scheduled",