Skip to content

fix: stop working timer when turn completes despite stale session status #1348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rdoupe wants to merge 4 commits into
base: main
Choose a base branch
from
+12 −2
Draft

fix: stop working timer when turn completes despite stale session status #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92b5bf6
fix: stop working timer when agent is awaiting user input
rdoupe Mar 24, 2026
d07855f
fix: stop working timer when turn is complete or awaiting user input
rdoupe Mar 24, 2026
a855928
style: apply oxfmt formatting
rdoupe Mar 24, 2026
96eba94
fix: use completedAt as reliable turn completion signal
rdoupe Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,6 @@ export default function ChatView({ threadId }: ChatViewProps) {
const phase = derivePhase(activeThread?.session ?? null);
const isSendBusy = sendPhase !== "idle";
const isPreparingWorktree = sendPhase === "preparing-worktree";
const isWorking = phase === "running" || isSendBusy || isConnecting || isRevertingCheckpoint;
const nowIso = new Date(nowTick).toISOString();
const activeWorkStartedAt = deriveActiveWorkStartedAt(
activeLatestTurn,
Expand All @@ -684,6 +683,13 @@ export default function ChatView({ threadId }: ChatViewProps) {
() => derivePendingUserInputs(threadActivities),
[threadActivities],
);
// phase === "running" alone isn't sufficient: the session can stay "running" even after
// the latest turn has completed (server lifecycle guard can reject status updates while
// completedAt is set through a separate path) or while waiting for user input.
// Use completedAt on the latest turn as the reliable completion signal.
const turnDone = !!activeLatestTurn?.completedAt;
const isActivelyRunning = phase === "running" && pendingUserInputs.length === 0 && !turnDone;
const isWorking = isActivelyRunning || isSendBusy || isConnecting || isRevertingCheckpoint;
const activePendingUserInput = pendingUserInputs[0] ?? null;
const activePendingDraftAnswers = useMemo(
() =>
Expand Down
6 changes: 5 additions & 1 deletion apps/web/src/components/Sidebar.logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ export function resolveThreadStatusPill(input: {
};
}

if (thread.session?.status === "running") {
// Use completedAt as the reliable completion signal — activeTurnId can be permanently
// stale when the server lifecycle guard rejects status updates.
const sidebarTurnDone = !!thread.latestTurn?.completedAt;

if (thread.session?.status === "running" && !sidebarTurnDone) {
return {
label: "Working",
colorClass: "text-sky-600 dark:text-sky-300/80",
Expand Down