chore: merge feat/dashboard-agent-ui (review fixes)

Author: kathiekiwi

apps/webapp/app/components/dashboard-agent/DashboardAgentPanel.tsx

@@ -39,6 +39,7 @@ import { explicitPromptTarget } from "./explicit-prompt";
 import { escapeClosesPanel } from "./panel-escape";
 import { markChatListRead, unreadWorkCount } from "./unread-counts";
 import { AgentPanelColumn } from "./panel-layout";
+import { markerAfterActiveChat, markerAfterActivity } from "./thinking-marker";
 import { concurrencyPath } from "~/utils/pathBuilder";
 
 function serializePageContext(pageContext: AgentPageContext): string | undefined {
@@ -138,9 +139,7 @@ export function DashboardAgentPanel({
   const [thinkingChatId, setThinkingChatId] = useState<string | null>(null);
   const handleActivityChange = useCallback(
     (chatId: string, activity: TurnActivity | null) => {
-      setThinkingChatId((previous) =>
-        activity !== null ? chatId : previous === chatId ? null : previous
-      );
+      setThinkingChatId((previous) => markerAfterActivity(previous, chatId, activity));
       onTurnActivityChange?.(chatId, activity !== null);
     },
     [onTurnActivityChange]
@@ -149,6 +148,11 @@ export function DashboardAgentPanel({
   // The read POST and its reload can land out of order, so mask the next list.
   const justRead = useRef<Set<string>>(new Set());
 
+  // Ordering-safe: if the new chat has not reported yet, its own report re-sets the marker.
+  useEffect(() => {
+    setThinkingChatId((previous) => markerAfterActiveChat(previous, active?.chatId));
+  }, [active?.chatId]);
+
   const loadHistory = useMemo(
     () =>
       createCoalescedReload(async () => {

apps/webapp/app/components/dashboard-agent/thinking-marker.test.ts

@@ -0,0 +1,24 @@
+import { describe, expect, it } from "vitest";
+import { markerAfterActiveChat, markerAfterActivity } from "./thinking-marker";
+
+describe("thinking marker", () => {
+  it("marks the chat that is working and clears it when the turn settles", () => {
+    const working = markerAfterActivity(null, "chat_1", "working");
+    expect(working).toBe("chat_1");
+    expect(markerAfterActivity(working, "chat_1", null)).toBe(null);
+  });
+
+  it("ignores a settled report from another chat", () => {
+    expect(markerAfterActivity("chat_1", "chat_2", null)).toBe("chat_1");
+  });
+
+  it("clears the marker when the user switches away mid-turn", () => {
+    // The streaming chat unmounts without reporting null, so only the switch clears it.
+    expect(markerAfterActiveChat("chat_1", "chat_2")).toBe(null);
+    expect(markerAfterActiveChat("chat_1", undefined)).toBe(null);
+  });
+
+  it("keeps the marker the chat just reported for itself", () => {
+    expect(markerAfterActiveChat("chat_1", "chat_1")).toBe("chat_1");
+  });
+});

apps/webapp/app/components/dashboard-agent/thinking-marker.ts

@@ -0,0 +1,20 @@
+import type { TurnActivity } from "./DashboardAgentMessages";
+
+// Which chat the history list shows as busy. Only the mounted chat reports.
+
+export function markerAfterActivity(
+  previous: string | null,
+  chatId: string,
+  activity: TurnActivity | null
+): string | null {
+  return activity !== null ? chatId : previous === chatId ? null : previous;
+}
+
+// A streaming chat unmounts on a switch without reporting null — the turn carries on
+// server-side — so the marker is dropped once another chat (or the draft) is active.
+export function markerAfterActiveChat(
+  previous: string | null,
+  activeChatId: string | undefined
+): string | null {
+  return previous === activeChatId ? previous : null;
+}