Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

fix(web): clear woke state on explicit thread actions (#5486)

Wout Stiens4f5834ba72c5
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index c260c9e91..7b59530c9 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -26,7 +26,11 @@ import {
connectionStatusTitle,
type EnvironmentConnectionPresentation,
} from "@t3tools/client-runtime/connection";
-import { effectiveSettled, effectiveSnoozed } from "@t3tools/client-runtime/state/thread-settled";
+import {
+ effectiveSettled,
+ effectiveSnoozed,
+ threadWokeAt,
+} from "@t3tools/client-runtime/state/thread-settled";
import {
parseScopedThreadKey,
scopedThreadKey,
@@ -1231,9 +1235,6 @@ function ChatViewContent(props: ChatViewProps) {
);
const activeServerThread = serverThread ?? loadingServerThread;
const markThreadVisited = useUiStateStore((store) => store.markThreadVisited);
- const activeThreadLastVisitedAt = useUiStateStore(
- (store) => store.threadLastVisitedAtById[routeThreadKey],
- );
const settings = useEnvironmentSettings(environmentId);
// New-thread defaults live in the primary environment's settings.json (the
// settings UI never writes to remote environments), so read them from the
@@ -1850,25 +1851,6 @@ function ChatViewContent(props: ChatViewProps) {
[openOrReuseProjectDraftThread],
);
- useEffect(() => {
- if (!serverThread?.id) return;
- const threadUpdatedAt = Date.parse(serverThread.updatedAt);
- if (Number.isNaN(threadUpdatedAt)) return;
- const lastVisitedAt = activeThreadLastVisitedAt ? Date.parse(activeThreadLastVisitedAt) : NaN;
- if (!Number.isNaN(lastVisitedAt) && lastVisitedAt >= threadUpdatedAt) return;
-
- markThreadVisited(
- scopedThreadKey(scopeThreadRef(serverThread.environmentId, serverThread.id)),
- serverThread.updatedAt,
- );
- }, [
- activeThreadLastVisitedAt,
- markThreadVisited,
- serverThread?.environmentId,
- serverThread?.id,
- serverThread?.updatedAt,
- ]);
-
const selectedProviderByThreadId = composerActiveProvider ?? null;
const threadProvider =
activeThread?.modelSelection.instanceId ??
@@ -4006,13 +3988,18 @@ function ChatViewContent(props: ChatViewProps) {
const supportsSettlement = serverConfig?.environment.capabilities.threadSettlement === true;
const supportsSnooze = serverConfig?.environment.capabilities.threadSnooze === true;
const nowMinute = useNowMinute();
+ const snoozeNow = new Date().toISOString();
const activeThreadSnoozed =
activeThreadShell !== null &&
supportsSnooze &&
- effectiveSnoozed(activeThreadShell, { now: new Date().toISOString() });
+ effectiveSnoozed(activeThreadShell, { now: snoozeNow });
const [snoozeWakeTick, bumpSnoozeWakeTick] = useState(0);
+ void snoozeWakeTick;
+ const activeThreadWokeAt =
+ activeThreadShell !== null && supportsSnooze
+ ? threadWokeAt(activeThreadShell, { now: snoozeNow })
+ : null;
useEffect(() => {
- void snoozeWakeTick;
if (!activeThreadSnoozed) return;
const wakeAtMs = Date.parse(activeThreadShell?.snoozedUntil ?? "");
if (!Number.isFinite(wakeAtMs)) return;
@@ -4022,6 +4009,10 @@ function ChatViewContent(props: ChatViewProps) {
);
return () => window.clearTimeout(id);
}, [activeThreadShell?.snoozedUntil, activeThreadSnoozed, snoozeWakeTick]);
+ const acknowledgeActiveThreadWoke = useCallback(() => {
+ if (activeThreadRef === null || activeThreadWokeAt === null) return;
+ markThreadVisited(scopedThreadKey(activeThreadRef), activeThreadWokeAt);
+ }, [activeThreadRef, activeThreadWokeAt, markThreadVisited]);
const activeThreadSettled = useMemo(() => {
if (activeThreadShell === null || !supportsSettlement) return false;
return effectiveSettled(activeThreadShell, {
@@ -5063,6 +5054,7 @@ function ChatViewContent(props: ChatViewProps) {
failure = startResult;
} else {
turnStartSucceeded = true;
+ acknowledgeActiveThreadWoke();
}
}
@@ -5422,6 +5414,7 @@ function ChatViewContent(props: ChatViewProps) {
}
if (failure === null) {
+ acknowledgeActiveThreadWoke();
// Optimistically open the plan sidebar when implementing (not refining).
// "default" mode here means the agent is executing the plan, which produces
// step-tracking activities that the sidebar will display.
@@ -5451,6 +5444,7 @@ function ChatViewContent(props: ChatViewProps) {
[
activeThread,
activeProposedPlan,
+ acknowledgeActiveThreadWoke,
beginLocalDispatch,
isConnecting,
isSendBusy,
diff --git a/apps/web/src/components/SidebarV2.tsx b/apps/web/src/components/SidebarV2.tsx
index 1444d72e6..462bfde13 100644
--- a/apps/web/src/components/SidebarV2.tsx
+++ b/apps/web/src/components/SidebarV2.tsx
@@ -431,6 +431,7 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
onUnsettle: (threadRef: ScopedThreadRef) => void;
onSnooze: (threadRef: ScopedThreadRef, preset: SnoozePreset) => void;
onUnsnooze: (threadRef: ScopedThreadRef) => void;
+ onAcknowledgeWoke: (threadRef: ScopedThreadRef, visitedAt: string) => void;
onChangeRequestState: (threadKey: string, state: "open" | "closed" | "merged" | null) => void;
}) {
const {
@@ -439,6 +440,7 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
onCancelRename,
onCommitRename,
onContextMenu,
+ onAcknowledgeWoke,
onRenameTitleChange,
onSettle,
onSnooze,
@@ -542,6 +544,7 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
className: "text-emerald-700 dark:text-emerald-300",
}
: null;
+ const isWokeStatus = topStatus?.icon === "woke";
const gitCwd = thread.worktreePath ?? props.projectCwd;
const gitStatus = useEnvironmentQuery(
@@ -605,6 +608,15 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
},
[onThreadClick, threadRef],
);
+ const handleAcknowledgeWokeClick = useCallback(
+ (event: ReactMouseEvent) => {
+ event.preventDefault();
+ event.stopPropagation();
+ if (props.wokeAt === null) return;
+ onAcknowledgeWoke(threadRef, props.wokeAt);
+ },
+ [onAcknowledgeWoke, props.wokeAt, threadRef],
+ );
const handleContextMenu = useCallback(
(event: ReactMouseEvent) => {
event.preventDefault();
@@ -853,7 +865,12 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
the time/jump label yields to the settle affordance. */}
{prBadge}
<span className="relative ml-auto flex h-6 min-w-8 shrink-0 items-center justify-end">
- <span className="inline-flex justify-end tabular-nums text-muted-foreground/55 transition-opacity group-hover/v2-row:opacity-0">
+ <span
+ className={cn(
+ "inline-flex justify-end tabular-nums text-muted-foreground/55 transition-opacity",
+ !isWoke && "group-hover/v2-row:opacity-0",
+ )}
+ >
{variantAction === "unsnooze" && props.snoozeWakeLabelText !== null ? (
// Snoozed rows show when they come BACK, not when they were
// last touched — the return ticket is the row's whole story.
@@ -863,14 +880,16 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
) : isWoke ? (
// A wake can land straight in the settled tail (e.g. PR
// merged while snoozed); the signal must survive the trip.
- <span
- role="status"
- aria-label="Woke from snooze"
- className="inline-flex items-center gap-1 text-xs font-medium text-amber-700 dark:text-amber-300"
+ <button
+ type="button"
+ aria-label="Dismiss Woke notification"
+ title="Dismiss Woke notification"
+ onClick={handleAcknowledgeWokeClick}
+ className="inline-flex cursor-pointer items-center gap-1 rounded-sm text-xs font-medium text-amber-700 outline-none hover:underline focus-visible:ring-2 focus-visible:ring-ring dark:text-amber-300"
>
<AlarmClockIcon aria-hidden className="size-3" />
- Woke
- </span>
+ <span role="status">Woke</span>
+ </button>
) : (
<span className="text-xs">
{variantAction === "unsettle"
@@ -885,7 +904,10 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
type="button"
aria-label="Wake thread now"
onClick={handleUnsnoozeClick}
- className="absolute inset-y-0 right-0 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-2 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:opacity-100 group-hover/v2-row:opacity-100"
+ className={cn(
+ "pointer-events-none absolute inset-y-0 right-0 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-2 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-hover/v2-row:pointer-events-auto group-hover/v2-row:opacity-100",
+ isWoke && "group-hover/v2-row:static",
+ )}
>
<AlarmClockOffIcon className="size-3" />
</button>
@@ -895,7 +917,10 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
type="button"
aria-label="Un-settle thread"
onClick={handleUnsettleClick}
- className="absolute inset-y-0 right-0 -mr-1 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-1.5 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:opacity-100 group-hover/v2-row:opacity-100"
+ className={cn(
+ "pointer-events-none absolute inset-y-0 right-0 -mr-1 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-1.5 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-hover/v2-row:pointer-events-auto group-hover/v2-row:opacity-100",
+ isWoke && "group-hover/v2-row:static",
+ )}
>
<Undo2Icon className="mb-px size-3.5" />
</button>
@@ -904,7 +929,10 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
type="button"
aria-label="Settle thread"
onClick={handleSettleClick}
- className="absolute inset-y-0 right-0 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-2 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:opacity-100 group-hover/v2-row:opacity-100"
+ className={cn(
+ "pointer-events-none absolute inset-y-0 right-0 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-2 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-hover/v2-row:pointer-events-auto group-hover/v2-row:opacity-100",
+ isWoke && "group-hover/v2-row:static",
+ )}
>
<CheckIcon className="size-3" />
</button>
@@ -972,39 +1000,56 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
the hidden state out of flow lets the project label reclaim
space without either state overlapping it. */}
<span className="group/v2-status-slot relative ml-auto flex h-5 min-w-8 shrink-0 items-stretch justify-end text-xs">
- {/* pointer-events-none: while hovered this label is absolute
- + opacity-0, which paints it ABOVE the in-flow settle/snooze
- buttons; without it the invisible label eats their clicks. */}
+ {/* Read-only status labels yield to the hover actions. Woke is
+ itself an action, so it stays pointer-enabled and visible
+ while the other controls appear beside it. */}
<span
className={cn(
- "pointer-events-none self-center justify-self-end tabular-nums text-muted-foreground/65 transition-opacity group-has-[:focus-visible]/v2-status-slot:absolute group-has-[:focus-visible]/v2-status-slot:right-0 group-has-[:focus-visible]/v2-status-slot:opacity-0 group-hover/v2-row:absolute group-hover/v2-row:right-0 group-hover/v2-row:opacity-0",
- snoozeMenuOpen && "absolute right-0 opacity-0",
+ isWokeStatus
+ ? "pointer-events-auto"
+ : "pointer-events-none group-has-[:focus-visible]/v2-status-slot:absolute group-has-[:focus-visible]/v2-status-slot:right-0 group-has-[:focus-visible]/v2-status-slot:opacity-0 group-hover/v2-row:absolute group-hover/v2-row:right-0 group-hover/v2-row:opacity-0",
+ "self-center justify-self-end tabular-nums text-muted-foreground/65 transition-opacity",
+ snoozeMenuOpen && "pointer-events-none absolute right-0 opacity-0",
)}
>
{topStatus ? (
- <span
- className={cn(
- "inline-flex items-center gap-1 font-medium",
- topStatus.className,
- )}
- >
- {topStatus.icon === "working" ? (
- <CircleDashedIcon aria-hidden className="size-4 shrink-0" />
- ) : topStatus.icon === "done" ? (
- <CircleCheckIcon aria-hidden className="size-4 shrink-0" />
- ) : topStatus.icon === "woke" ? (
+ isWokeStatus ? (
+ <button
+ type="button"
+ aria-label="Dismiss Woke notification"
+ title="Dismiss Woke notification"
+ onClick={handleAcknowledgeWokeClick}
+ className={cn(
+ "inline-flex cursor-pointer items-center gap-1 rounded-sm font-medium outline-none hover:underline focus-visible:ring-2 focus-visible:ring-ring",
+ topStatus.className,
+ )}
+ >
<AlarmClockIcon aria-hidden className="size-4 shrink-0" />
- ) : null}
- {/* The label alone is the live region: a role="status"
- wrapper around the ticking duration would make
- screen readers announce every second. */}
- <span role="status">{topStatus.label}</span>
- {status === "working" ? (
- <span aria-hidden>
- <WorkingDuration startedAt={resolveWorkingStartedAt(thread)} />
- </span>
- ) : null}
- </span>
+ <span role="status">{topStatus.label}</span>
+ </button>
+ ) : (
+ <span
+ className={cn(
+ "inline-flex items-center gap-1 font-medium",
+ topStatus.className,
+ )}
+ >
+ {topStatus.icon === "working" ? (
+ <CircleDashedIcon aria-hidden className="size-4 shrink-0" />
+ ) : topStatus.icon === "done" ? (
+ <CircleCheckIcon aria-hidden className="size-4 shrink-0" />
+ ) : null}
+ {/* The label alone is the live region: a role="status"
+ wrapper around the ticking duration would make
+ screen readers announce every second. */}
+ <span role="status">{topStatus.label}</span>
+ {status === "working" ? (
+ <span aria-hidden>
+ <WorkingDuration startedAt={resolveWorkingStartedAt(thread)} />
+ </span>
+ ) : null}
+ </span>
+ )
) : (
threadTimeLabel(thread)
)}
@@ -1017,8 +1062,8 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
// would keep the controls pinned over the status label
// once the pointer moves away (e.g. after a failed
// settle) instead of cross-fading back.
- "absolute inset-y-0 right-0 flex items-stretch opacity-0 transition-opacity has-[:focus-visible]:static has-[:focus-visible]:opacity-100 group-hover/v2-row:static group-hover/v2-row:opacity-100",
- snoozeMenuOpen && "static opacity-100",
+ "pointer-events-none absolute inset-y-0 right-0 flex items-stretch opacity-0 transition-opacity has-[:focus-visible]:pointer-events-auto has-[:focus-visible]:static has-[:focus-visible]:opacity-100 group-hover/v2-row:pointer-events-auto group-hover/v2-row:static group-hover/v2-row:opacity-100",
+ snoozeMenuOpen && "pointer-events-auto static opacity-100",
)}
>
{showSnoozeButton ? (
@@ -1288,6 +1333,13 @@ export default function SidebarV2() {
const toggleThreadSelection = useThreadSelectionStore((s) => s.toggleThread);
const rangeSelectTo = useThreadSelectionStore((s) => s.rangeSelectTo);
const markThreadUnread = useUiStateStore((s) => s.markThreadUnread);
+ const markThreadVisited = useUiStateStore((s) => s.markThreadVisited);
+ const acknowledgeWoke = useCallback(
+ (threadRef: ScopedThreadRef, visitedAt: string) => {
+ markThreadVisited(scopedThreadKey(threadRef), visitedAt);
+ },
+ [markThreadVisited],
+ );
const routeTarget = useParams({
strict: false,
select: (params) => resolveThreadRouteTarget(params),
@@ -3022,6 +3074,7 @@ export default function SidebarV2() {
onUnsettle={attemptUnsettle}
onSnooze={attemptSnooze}
onUnsnooze={attemptUnsnooze}
+ onAcknowledgeWoke={acknowledgeWoke}
onChangeRequestState={handleChangeRequestState}
/>
);
diff --git a/apps/web/src/hooks/useThreadActions.ts b/apps/web/src/hooks/useThreadActions.ts
index 96ec64555..e47fce1d3 100644
--- a/apps/web/src/hooks/useThreadActions.ts
+++ b/apps/web/src/hooks/useThreadActions.ts
@@ -2,9 +2,10 @@ import {
parseScopedThreadKey,
scopeProjectRef,
scopeThreadRef,
+ scopedThreadKey,
} from "@t3tools/client-runtime/environment";
import { settlePromise, squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
-import { canSettle, canSnooze } from "@t3tools/client-runtime/state/thread-settled";
+import { canSettle, canSnooze, threadWokeAt } from "@t3tools/client-runtime/state/thread-settled";
import { EnvironmentId, type ScopedThreadRef, ThreadId } from "@t3tools/contracts";
import * as Cause from "effect/Cause";
import * as Schema from "effect/Schema";
@@ -29,6 +30,7 @@ import {
readThreadShell,
} from "../state/entities";
import { useTerminalUiStateStore } from "../terminalUiStateStore";
+import { useUiStateStore } from "../uiStateStore";
import { buildThreadRouteParams, resolveThreadRouteRef } from "../threadRoutes";
import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
import { stackedThreadToast, toastManager } from "../components/ui/toast";
@@ -150,6 +152,7 @@ export function useThreadActions() {
(store) => store.clearProjectDraftThreadById,
);
const clearTerminalUiState = useTerminalUiStateStore((state) => state.clearTerminalUiState);
+ const markThreadVisited = useUiStateStore((state) => state.markThreadVisited);
const router = useRouter();
const handleNewThread = useNewThreadHandler();
// Keep a ref so archiveThread can call handleNewThread without appearing in
@@ -201,6 +204,10 @@ export function useThreadActions() {
if (archiveResult._tag === "Failure") {
return archiveResult;
}
+ const wokeAt = threadWokeAt(thread, { now: new Date().toISOString() });
+ if (wokeAt !== null) {
+ markThreadVisited(scopedThreadKey(threadRef), wokeAt);
+ }
refreshArchivedThreadsForEnvironment(threadRef.environmentId);
opts.onArchived?.();
@@ -216,7 +223,7 @@ export function useThreadActions() {
return archiveResult;
},
- [archiveThreadMutation, getCurrentRouteThreadRef, resolveThreadTarget],
+ [archiveThreadMutation, getCurrentRouteThreadRef, markThreadVisited, resolveThreadTarget],
);
const unarchiveThread = useCallback(
@@ -459,14 +466,21 @@ export function useThreadActions() {
),
);
}
+ const wokeAt = resolved
+ ? threadWokeAt(resolved.thread, { now: new Date().toISOString() })
+ : null;
// Settle is a high-frequency lifecycle action and stays silent — no
// toast.
- return settleThreadMutation({
+ const result = await settleThreadMutation({
environmentId: target.environmentId,
input: { threadId: target.threadId },
});
+ if (result._tag === "Success" && wokeAt !== null) {
+ markThreadVisited(scopedThreadKey(target), wokeAt);
+ }
+ return result;
},
- [resolveThreadTarget, settleThreadMutation],
+ [markThreadVisited, resolveThreadTarget, settleThreadMutation],
);
const unsettleThread = useCallback(