@devries-cameron20 / t3code-1 / commits / 7239986680
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(web): deleting the open thread no longer opens a snoozed or settled thread (#29643)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Julius Marminge committed Nov 3, 2026 at 11:59 UTC 7239986680d1f0af0e711a68293e3a4a17c8064b
3 files changed +44 -3
apps/web/src/components/Sidebar.logic.test.ts
+35
@@ -624,10 +624,45 @@ describe("getFallbackThreadIdAfterDelete", () => {
624 deletedThreadId: ThreadId.make("thread-active"),
625 deletedThreadIds: new Set([ThreadId.make("thread-active"), ThreadId.make("thread-newest")]),
626 sortOrder: "created_at",
627 + now: "2026-03-09T10:10:00.000Z",
628 });
629
630 expect(fallbackThreadId).toBe(ThreadId.make("thread-next"));
631 });
632 +
633 + it.each([
634 + [
635 + "snoozed",
636 + { snoozedUntil: "2099-01-01T00:00:00.000Z", snoozedAt: "2026-03-09T10:06:00.000Z" },
637 + ],
638 + ["settled", { settledOverride: "settled", settledAt: "2026-03-09T10:06:00.000Z" }],
639 + ] as const)("skips a %s thread parked on its shelf", (_state, parked) => {
640 + const fallbackThreadId = getFallbackThreadIdAfterDelete({
641 + threads: [
642 + makeThread({
643 + id: ThreadId.make("thread-visible"),
644 + createdAt: "2026-03-09T10:01:00.000Z",
645 + updatedAt: "2026-03-09T10:01:00.000Z",
646 + }),
647 + makeThread({
648 + id: ThreadId.make("thread-parked"),
649 + createdAt: "2026-03-09T10:02:00.000Z",
650 + updatedAt: "2026-03-09T10:06:00.000Z",
651 + ...parked,
652 + }),
653 + makeThread({
654 + id: ThreadId.make("thread-active"),
655 + createdAt: "2026-03-09T10:03:00.000Z",
656 + updatedAt: "2026-03-09T10:03:00.000Z",
657 + }),
658 + ],
659 + deletedThreadId: ThreadId.make("thread-active"),
660 + sortOrder: "created_at",
661 + now: "2026-03-09T10:10:00.000Z",
662 + });
663 +
664 + expect(fallbackThreadId).toBe(ThreadId.make("thread-visible"));
665 + });
666 });
667
668 describe("sortScopedProjectsForSidebar", () => {
apps/web/src/components/Sidebar.logic.ts
+8 -3
@@ -1211,14 +1211,17 @@ export function resolveThreadStatusPill(input: {
1211 }
1212
1213 export function getFallbackThreadIdAfterDelete<
1214 - T extends Pick<Thread, "id" | "projectId" | "createdAt" | "updatedAt"> & ThreadSortInput,
1214 + T extends Pick<Thread, "id" | "projectId" | "createdAt" | "updatedAt" | "settledOverride"> &
1215 + ThreadSortInput &
1216 + ThreadSnoozeShell,
1217 >(input: {
1218 threads: readonly T[];
1219 deletedThreadId: T["id"];
1220 sortOrder: SidebarThreadSortOrder;
1221 + now: string;
1222 deletedThreadIds?: ReadonlySet<T["id"]>;
1223 }): T["id"] | null {
1221 - const { deletedThreadId, deletedThreadIds, sortOrder, threads } = input;
1224 + const { deletedThreadId, deletedThreadIds, sortOrder, now, threads } = input;
1225 const deletedThread = threads.find((thread) => thread.id === deletedThreadId);
1226 if (!deletedThread) {
1227 return null;
@@ -1230,7 +1233,9 @@ export function getFallbackThreadIdAfterDelete<
1233 (thread) =>
1234 thread.projectId === deletedThread.projectId &&
1235 thread.id !== deletedThreadId &&
1233 - !deletedThreadIds?.has(thread.id),
1236 + !deletedThreadIds?.has(thread.id) &&
1237 + thread.settledOverride !== "settled" &&
1238 + !effectiveSnoozed(thread, { now }),
1239 ),
1240 sortOrder,
1241 )[0]?.id ?? null
apps/web/src/hooks/useThreadActions.ts
+1
@@ -554,6 +554,7 @@ export function useThreadActions() {
554 deletedThreadId: threadRef.threadId,
555 deletedThreadIds,
556 sortOrder: sidebarThreadSortOrder,
557 + now: new Date().toISOString(),
558 });
559 const deleteResult = await deleteThreadMutation({
560 environmentId: threadRef.environmentId,