Skip to content

Commit ea3ba7d

Browse files
fix(desktop): keep background completions unread
1 parent 69f4c7e commit ea3ba7d

3 files changed

Lines changed: 129 additions & 17 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ import {
141141
type PendingUserInputDraftAnswer,
142142
} from "../pendingUserInput";
143143
import { useUiStateStore } from "../uiStateStore";
144+
import { useAcknowledgeThreadCompletion } from "./chat/useAcknowledgeThreadCompletion";
144145
import {
145146
latestWorkspaceMutationId,
146147
useWorkspaceMutationRefresh,
@@ -1976,24 +1977,15 @@ export default function ChatView(props: ChatViewProps) {
19761977
const activeRunningTurnId =
19771978
(activeThread?.session?.status === "running" ? activeThread.session.activeTurnId : null) ??
19781979
(activeLatestTurn?.state === "running" ? activeLatestTurn.turnId : null);
1979-
// Reading a finished thread clears the sidebar's Done badge. The visit is
1980-
// stamped at the turn's completion time — not now/updatedAt — so it clears
1981-
// exactly the completion the user is looking at: a wake or completion that
1982-
// lands later still gets its signal (markThreadVisited never moves the
1983-
// timestamp backwards).
1984-
useEffect(() => {
1985-
const completedAt = serverThread?.latestTurn?.completedAt;
1986-
if (!serverThread?.id || !completedAt) return;
1987-
markThreadVisited(
1988-
scopedThreadKey(scopeThreadRef(serverThread.environmentId, serverThread.id)),
1989-
completedAt,
1990-
);
1991-
}, [
1992-
markThreadVisited,
1993-
serverThread?.environmentId,
1994-
serverThread?.id,
1980+
const completedThreadKey = serverThread?.id
1981+
? scopedThreadKey(scopeThreadRef(serverThread.environmentId, serverThread.id))
1982+
: null;
1983+
useAcknowledgeThreadCompletion(
1984+
completedThreadKey,
19951985
serverThread?.latestTurn?.completedAt,
1996-
]);
1986+
markThreadVisited,
1987+
isElectron,
1988+
);
19971989
useEffect(() => {
19981990
setMountedTerminalThreadKeys((currentThreadIds) => {
19991991
const nextThreadIds = reconcileMountedTerminalThreadIds({
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
import { act } from "react";
2+
import { create, type ReactTestRenderer } from "react-test-renderer";
3+
import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
4+
5+
import { useAcknowledgeThreadCompletion } from "./useAcknowledgeThreadCompletion";
6+
7+
const threadKey = "environment-1:thread-1";
8+
const completedAt = "2026-09-10T05:01:06.022Z";
9+
10+
let page: EventTarget & {
11+
visibilityState: DocumentVisibilityState;
12+
hasFocus: ReturnType<typeof vi.fn<() => boolean>>;
13+
};
14+
let browserWindow: EventTarget;
15+
let renderer: ReactTestRenderer | null;
16+
17+
function CompletionProbe(props: {
18+
acknowledge: (key: string, at: string) => void;
19+
deferWhilePageInactive?: boolean;
20+
}) {
21+
useAcknowledgeThreadCompletion(
22+
threadKey,
23+
completedAt,
24+
props.acknowledge,
25+
props.deferWhilePageInactive ?? true,
26+
);
27+
return null;
28+
}
29+
30+
beforeEach(() => {
31+
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
32+
page = Object.assign(new EventTarget(), {
33+
visibilityState: "visible" as DocumentVisibilityState,
34+
hasFocus: vi.fn(() => true),
35+
});
36+
browserWindow = new EventTarget();
37+
vi.stubGlobal("document", page);
38+
vi.stubGlobal("window", browserWindow);
39+
renderer = null;
40+
});
41+
42+
afterEach(async () => {
43+
await act(async () => renderer?.unmount());
44+
vi.unstubAllGlobals();
45+
});
46+
47+
describe("useAcknowledgeThreadCompletion", () => {
48+
it("acknowledges a completed thread while the page is being viewed", async () => {
49+
const acknowledge = vi.fn();
50+
51+
await act(async () => {
52+
renderer = create(<CompletionProbe acknowledge={acknowledge} />);
53+
});
54+
55+
expect(acknowledge).toHaveBeenCalledWith(threadKey, completedAt);
56+
});
57+
58+
it("waits to acknowledge a background completion until the window is focused", async () => {
59+
const acknowledge = vi.fn();
60+
page.visibilityState = "hidden";
61+
page.hasFocus.mockReturnValue(false);
62+
63+
await act(async () => {
64+
renderer = create(<CompletionProbe acknowledge={acknowledge} />);
65+
});
66+
expect(acknowledge).not.toHaveBeenCalled();
67+
68+
page.visibilityState = "visible";
69+
await act(async () => page.dispatchEvent(new Event("visibilitychange")));
70+
expect(acknowledge).not.toHaveBeenCalled();
71+
72+
page.hasFocus.mockReturnValue(true);
73+
await act(async () => browserWindow.dispatchEvent(new Event("focus")));
74+
expect(acknowledge).toHaveBeenCalledWith(threadKey, completedAt);
75+
});
76+
77+
it("preserves immediate acknowledgement outside the desktop app", async () => {
78+
const acknowledge = vi.fn();
79+
page.visibilityState = "hidden";
80+
page.hasFocus.mockReturnValue(false);
81+
82+
await act(async () => {
83+
renderer = create(
84+
<CompletionProbe acknowledge={acknowledge} deferWhilePageInactive={false} />,
85+
);
86+
});
87+
88+
expect(acknowledge).toHaveBeenCalledWith(threadKey, completedAt);
89+
});
90+
});
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import { useEffect } from "react";
2+
3+
export function useAcknowledgeThreadCompletion(
4+
threadKey: string | null,
5+
completedAt: string | null | undefined,
6+
acknowledge: (threadKey: string, completedAt: string) => void,
7+
deferWhilePageInactive: boolean,
8+
) {
9+
useEffect(() => {
10+
if (threadKey === null || !completedAt) return;
11+
12+
const acknowledgeIfViewed = () => {
13+
if (
14+
deferWhilePageInactive &&
15+
(document.visibilityState !== "visible" || !document.hasFocus())
16+
) {
17+
return;
18+
}
19+
acknowledge(threadKey, completedAt);
20+
};
21+
22+
acknowledgeIfViewed();
23+
window.addEventListener("focus", acknowledgeIfViewed);
24+
document.addEventListener("visibilitychange", acknowledgeIfViewed);
25+
return () => {
26+
window.removeEventListener("focus", acknowledgeIfViewed);
27+
document.removeEventListener("visibilitychange", acknowledgeIfViewed);
28+
};
29+
}, [acknowledge, completedAt, deferWhilePageInactive, threadKey]);
30+
}

0 commit comments

Comments
 (0)