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.
Show project status dots when collapsed in the sidebar (#1097)
mariabc12421736fd
diff --git a/apps/web/src/components/Sidebar.logic.test.ts b/apps/web/src/components/Sidebar.logic.test.tsindex 8c3b47010..19d6f3060 100644--- a/apps/web/src/components/Sidebar.logic.test.ts+++ b/apps/web/src/components/Sidebar.logic.test.ts@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";import {hasUnseenCompletion,+ resolveProjectStatusIndicator,resolveSidebarNewThreadEnvMode,resolveThreadRowClassName,resolveThreadStatusPill,@@ -230,3 +231,53 @@ describe("resolveThreadRowClassName", () => {expect(className).toContain("hover:bg-accent");});});++describe("resolveProjectStatusIndicator", () => {+ it("returns null when no threads have a notable status", () => {+ expect(resolveProjectStatusIndicator([null, null])).toBeNull();+ });++ it("surfaces the highest-priority actionable state across project threads", () => {+ expect(+ resolveProjectStatusIndicator([+ {+ label: "Completed",+ colorClass: "text-emerald-600",+ dotClass: "bg-emerald-500",+ pulse: false,+ },+ {+ label: "Pending Approval",+ colorClass: "text-amber-600",+ dotClass: "bg-amber-500",+ pulse: false,+ },+ {+ label: "Working",+ colorClass: "text-sky-600",+ dotClass: "bg-sky-500",+ pulse: true,+ },+ ]),+ ).toMatchObject({ label: "Pending Approval", dotClass: "bg-amber-500" });+ });++ it("prefers plan-ready over completed when no stronger action is needed", () => {+ expect(+ resolveProjectStatusIndicator([+ {+ label: "Completed",+ colorClass: "text-emerald-600",+ dotClass: "bg-emerald-500",+ pulse: false,+ },+ {+ label: "Plan Ready",+ colorClass: "text-violet-600",+ dotClass: "bg-violet-500",+ pulse: false,+ },+ ]),+ ).toMatchObject({ label: "Plan Ready", dotClass: "bg-violet-500" });+ });+});diff --git a/apps/web/src/components/Sidebar.logic.ts b/apps/web/src/components/Sidebar.logic.tsindex d9b394e4d..ef338dab6 100644--- a/apps/web/src/components/Sidebar.logic.ts+++ b/apps/web/src/components/Sidebar.logic.ts@@ -22,6 +22,15 @@ export interface ThreadStatusPill {pulse: boolean;}+const THREAD_STATUS_PRIORITY: Record<ThreadStatusPill["label"], number> = {+ "Pending Approval": 5,+ "Awaiting Input": 4,+ Working: 3,+ Connecting: 3,+ "Plan Ready": 2,+ Completed: 1,+};+type ThreadStatusInput = Pick<Thread,"interactionMode" | "latestTurn" | "lastVisitedAt" | "proposedPlans" | "session"@@ -151,3 +160,21 @@ export function resolveThreadStatusPill(input: {return null;}++export function resolveProjectStatusIndicator(+ statuses: ReadonlyArray<ThreadStatusPill | null>,+): ThreadStatusPill | null {+ let highestPriorityStatus: ThreadStatusPill | null = null;++ for (const status of statuses) {+ if (status === null) continue;+ if (+ highestPriorityStatus === null ||+ THREAD_STATUS_PRIORITY[status.label] > THREAD_STATUS_PRIORITY[highestPriorityStatus.label]+ ) {+ highestPriorityStatus = status;+ }+ }++ return highestPriorityStatus;+}diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsxindex 88f4bd444..932c1d25d 100644--- a/apps/web/src/components/Sidebar.tsx+++ b/apps/web/src/components/Sidebar.tsx@@ -84,6 +84,7 @@ import { useThreadSelectionStore } from "../threadSelectionStore";import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";import { isNonEmpty as isNonEmptyString } from "effect/String";import {+ resolveProjectStatusIndicator,resolveSidebarNewThreadEnvMode,resolveThreadRowClassName,resolveThreadStatusPill,@@ -1340,13 +1341,22 @@ export default function Sidebar() {if (byDate !== 0) return byDate;return b.id.localeCompare(a.id);});+ const projectStatus = resolveProjectStatusIndicator(+ projectThreads.map((thread) =>+ resolveThreadStatusPill({+ thread,+ hasPendingApprovals: derivePendingApprovals(thread.activities).length > 0,+ hasPendingUserInput: derivePendingUserInputs(thread.activities).length > 0,+ }),+ ),+ );const isThreadListExpanded = expandedThreadListsByProject.has(project.id);const hasHiddenThreads = projectThreads.length > THREAD_PREVIEW_LIMIT;const visibleThreads =hasHiddenThreads && !isThreadListExpanded? projectThreads.slice(0, THREAD_PREVIEW_LIMIT): projectThreads;- const orderedProjectThreadIds = projectThreads.map((t) => t.id);+ const orderedProjectThreadIds = projectThreads.map((thread) => thread.id);return (<SortableProjectItem key={project.id} projectId={project.id}>@@ -1369,11 +1379,28 @@ export default function Sidebar() {});}}>- <ChevronRightIcon- className={`-ml-0.5 size-3.5 shrink-0 text-muted-foreground/70 transition-transform duration-150 ${- project.expanded ? "rotate-90" : ""- }`}- />+ {!project.expanded && projectStatus ? (+ <span+ aria-hidden="true"+ title={projectStatus.label}+ className={`-ml-0.5 relative inline-flex size-3.5 shrink-0 items-center justify-center ${projectStatus.colorClass}`}+ >+ <span className="absolute inset-0 flex items-center justify-center transition-opacity duration-150 group-hover/project-header:opacity-0">+ <span+ className={`size-[9px] rounded-full ${projectStatus.dotClass} ${+ projectStatus.pulse ? "animate-pulse" : ""+ }`}+ />+ </span>+ <ChevronRightIcon className="absolute inset-0 m-auto size-3.5 text-muted-foreground/70 opacity-0 transition-opacity duration-150 group-hover/project-header:opacity-100" />+ </span>+ ) : (+ <ChevronRightIcon+ className={`-ml-0.5 size-3.5 shrink-0 text-muted-foreground/70 transition-transform duration-150 ${+ project.expanded ? "rotate-90" : ""+ }`}+ />+ )}<ProjectFavicon cwd={project.cwd} /><span className="flex-1 truncate text-xs font-medium text-foreground/90">{project.name}