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.
Extract independent web cleanup from mobile stack (#2855)
Theo Brownecf07d0632174
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsxindex f18502cb1..8cefb4e18 100644--- a/apps/web/src/components/ChatView.tsx+++ b/apps/web/src/components/ChatView.tsx@@ -1408,8 +1408,9 @@ export default function ChatView(props: ChatViewProps) {if (previewUrls.length === 0) return;const previousPreviewUrls = attachmentPreviewHandoffByMessageIdRef.current[messageId] ?? [];+ const nextPreviewUrlSet = new Set(previewUrls);for (const previewUrl of previousPreviewUrls) {- if (!previewUrls.includes(previewUrl)) {+ if (!nextPreviewUrlSet.has(previewUrl)) {revokeBlobPreviewUrl(previewUrl);}}diff --git a/apps/web/src/components/Sidebar.logic.ts b/apps/web/src/components/Sidebar.logic.tsindex 39b759ac3..b9dd27dfb 100644--- a/apps/web/src/components/Sidebar.logic.ts+++ b/apps/web/src/components/Sidebar.logic.ts@@ -300,7 +300,7 @@ export function resolveThreadRowClassName(input: {isSelected: boolean;}): string {const baseClassName =- "h-7 w-full translate-x-0 cursor-pointer justify-start px-2 text-left select-none focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-ring";+ "h-6 w-full translate-x-0 cursor-pointer justify-start px-2 text-left select-none focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-ring sm:h-7";if (input.isSelected && input.isActive) {return cn(diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsxindex e8c5bbe0b..1b96bb71c 100644--- a/apps/web/src/components/Sidebar.tsx+++ b/apps/web/src/components/Sidebar.tsx@@ -680,11 +680,11 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowPrender={<spanaria-label={threadEnvironmentLabel ?? "Remote"}- className="inline-flex h-5 items-center justify-center"+ className="inline-flex items-center justify-center"/>}>- <CloudIcon className="block size-3 text-muted-foreground/60" />+ <CloudIcon className="size-3 text-muted-foreground/40" /></TooltipTrigger><TooltipPopup side="top">{threadEnvironmentLabel}</TooltipPopup></Tooltip>@@ -809,7 +809,7 @@ const SidebarProjectThreadList = memo(function SidebarProjectThreadList(return (<SidebarMenuSubref={attachThreadListAutoAnimateRef}- className="mx-1 my-0 w-full translate-x-0 gap-0.5 overflow-hidden px-1.5 py-0"+ className="mx-0.5 my-0 w-full translate-x-0 gap-0.5 overflow-hidden px-1 py-0 sm:mx-1 sm:px-1.5">{shouldShowThreadPanel && showEmptyThreadState ? (<SidebarMenuSubItem className="w-full" data-thread-selection-safe>diff --git a/apps/web/src/components/chat/ChatHeader.tsx b/apps/web/src/components/chat/ChatHeader.tsxindex 3cd4576ab..ac4203175 100644--- a/apps/web/src/components/chat/ChatHeader.tsx+++ b/apps/web/src/components/chat/ChatHeader.tsx@@ -89,17 +89,20 @@ export const ChatHeader = memo(function ChatHeader({});return (- <div className="@container/header-actions flex min-w-0 flex-1 items-center gap-2">- <div className="flex min-w-0 flex-1 items-center gap-2 overflow-hidden sm:gap-3">+ <div className="@container/header-actions flex min-w-0 flex-1 flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">+ <div className="flex min-w-0 flex-wrap items-center gap-2 overflow-hidden sm:flex-1 sm:flex-nowrap sm:gap-3"><SidebarTrigger className="size-7 shrink-0 md:hidden" /><h2- className="min-w-0 shrink truncate text-sm font-medium text-foreground"+ className="min-w-0 flex-1 basis-40 truncate text-sm font-medium text-foreground"title={activeThreadTitle}>{activeThreadTitle}</h2>{activeProjectName && (- <Badge variant="outline" className="min-w-0 shrink overflow-hidden">+ <Badge+ variant="outline"+ className="min-w-0 max-w-full shrink overflow-hidden sm:max-w-56"+ ><span className="min-w-0 truncate">{activeProjectName}</span></Badge>)}@@ -109,7 +112,7 @@ export const ChatHeader = memo(function ChatHeader({</Badge>)}</div>- <div className="flex shrink-0 items-center justify-end gap-2 @3xl/header-actions:gap-3">+ <div className="flex min-w-0 flex-wrap items-center justify-start gap-2 sm:shrink-0 sm:justify-end @3xl/header-actions:gap-3">{activeProjectScripts && (<ProjectScriptsControlscripts={activeProjectScripts}diff --git a/apps/web/src/components/chat/OpenInPicker.tsx b/apps/web/src/components/chat/OpenInPicker.tsxindex 6b5f2dacc..cc023d34c 100644--- a/apps/web/src/components/chat/OpenInPicker.tsx+++ b/apps/web/src/components/chat/OpenInPicker.tsx@@ -146,7 +146,8 @@ const resolveOptions = (platform: string, availableEditors: ReadonlyArray<Editorvalue: "file-manager",},];- return baseOptions.filter((option) => availableEditors.includes(option.value));+ const availableEditorSet = new Set(availableEditors);+ return baseOptions.filter((option) => availableEditorSet.has(option.value));};export const OpenInPicker = memo(function OpenInPicker({diff --git a/apps/web/src/lib/contextWindow.test.ts b/apps/web/src/lib/contextWindow.test.tsindex 70479b3fa..8cb6a7f58 100644--- a/apps/web/src/lib/contextWindow.test.ts+++ b/apps/web/src/lib/contextWindow.test.ts@@ -44,6 +44,23 @@ describe("contextWindow", () => {expect(snapshot).toBeNull();});+ it("keeps valid zero-usage snapshots", () => {+ const snapshot = deriveLatestContextWindowSnapshot([+ makeActivity("activity-1", "context-window.updated", {+ usedTokens: 0,+ maxTokens: 100_000,+ }),+ ]);++ expect(snapshot).toMatchObject({+ usedTokens: 0,+ maxTokens: 100_000,+ remainingTokens: 100_000,+ usedPercentage: 0,+ remainingPercentage: 100,+ });+ });+it("formats compact token counts", () => {expect(formatContextWindowTokens(999)).toBe("999");expect(formatContextWindowTokens(1400)).toBe("1.4k");diff --git a/apps/web/src/lib/contextWindow.ts b/apps/web/src/lib/contextWindow.tsindex f668135a1..02cf26219 100644--- a/apps/web/src/lib/contextWindow.ts+++ b/apps/web/src/lib/contextWindow.ts@@ -36,7 +36,7 @@ export function deriveLatestContextWindowSnapshot(const payload = asRecord(activity.payload);const usedTokens = asFiniteNumber(payload?.usedTokens);- if (usedTokens === null || usedTokens <= 0) {+ if (usedTokens === null || usedTokens < 0) {continue;}diff --git a/apps/web/src/lib/lruCache.test.ts b/apps/web/src/lib/lruCache.test.tsindex 7f53db260..62060a7b5 100644--- a/apps/web/src/lib/lruCache.test.ts+++ b/apps/web/src/lib/lruCache.test.ts@@ -40,4 +40,21 @@ describe("LRUCache", () => {expect(cache.get("b")).toBe("B");expect(cache.get("c")).toBe("C");});++ it("does not cache entries larger than the memory budget", () => {+ const cache = new LRUCache<string>(2, 25);+ cache.set("a", "A", 10);+ cache.set("oversized", "X", 30);++ expect(cache.get("a")).toBe("A");+ expect(cache.get("oversized")).toBeNull();+ });++ it("preserves an existing entry when an oversized replacement is rejected", () => {+ const cache = new LRUCache<string>(2, 25);+ cache.set("a", "A", 10);+ cache.set("a", "oversized", 30);++ expect(cache.get("a")).toBe("A");+ });});diff --git a/apps/web/src/lib/lruCache.ts b/apps/web/src/lib/lruCache.tsindex 141c796e7..659257343 100644--- a/apps/web/src/lib/lruCache.ts+++ b/apps/web/src/lib/lruCache.ts@@ -23,6 +23,10 @@ export class LRUCache<T> {}set(key: string, value: T, approximateSize: number): void {+ if (approximateSize > this.maxMemoryBytes) {+ return;+ }+const existing = this.cache.get(key);if (existing) {this.totalSize -= existing.approximateSize;diff --git a/apps/web/src/lib/threadSort.test.ts b/apps/web/src/lib/threadSort.test.tsindex 2a69357c4..88e961786 100644--- a/apps/web/src/lib/threadSort.test.ts+++ b/apps/web/src/lib/threadSort.test.ts@@ -114,6 +114,31 @@ describe("sortThreads", () => {]);});+ it("falls back to createdAt when updatedAt is invalid", () => {+ const sorted = sortThreads(+ [+ makeThread({+ id: ThreadId.make("thread-1"),+ createdAt: "2026-03-09T10:00:00.000Z",+ updatedAt: "invalid-date" as never,+ messages: [],+ }),+ makeThread({+ id: ThreadId.make("thread-2"),+ createdAt: "2026-03-09T09:00:00.000Z",+ updatedAt: "2026-03-09T09:30:00.000Z",+ messages: [],+ }),+ ],+ "updated_at",+ );++ expect(sorted.map((thread) => thread.id)).toEqual([+ ThreadId.make("thread-1"),+ ThreadId.make("thread-2"),+ ]);+ });+it("falls back to id ordering when threads have no sortable timestamps", () => {const sorted = sortThreads([@@ -162,6 +187,29 @@ describe("sortThreads", () => {]);});+ it("uses updatedAt as a fallback for created_at sorting when createdAt is invalid", () => {+ const sorted = sortThreads(+ [+ makeThread({+ id: ThreadId.make("thread-1"),+ createdAt: "invalid-date" as never,+ updatedAt: "2026-03-09T10:05:00.000Z",+ }),+ makeThread({+ id: ThreadId.make("thread-2"),+ createdAt: "2026-03-09T10:00:00.000Z",+ updatedAt: "2026-03-09T10:10:00.000Z",+ }),+ ],+ "created_at",+ );++ expect(sorted.map((thread) => thread.id)).toEqual([+ ThreadId.make("thread-1"),+ ThreadId.make("thread-2"),+ ]);+ });+it("returns the latest active thread for a project", () => {const latestThread = getLatestThreadForProject([diff --git a/apps/web/src/lib/threadSort.ts b/apps/web/src/lib/threadSort.tsindex 837a7788d..de8b22e93 100644--- a/apps/web/src/lib/threadSort.ts+++ b/apps/web/src/lib/threadSort.ts@@ -13,6 +13,17 @@ export function toSortableTimestamp(iso: string | undefined): number | null {return Number.isFinite(ms) ? ms : null;}+function getFirstSortableTimestamp(...values: Array<string | null | undefined>): number | null {+ for (const value of values) {+ const timestamp = toSortableTimestamp(value ?? undefined);+ if (timestamp !== null) {+ return timestamp;+ }+ }++ return null;+}+function getLatestUserMessageTimestamp(thread: ThreadSortInput): number {if (thread.latestUserMessageAt) {return toSortableTimestamp(thread.latestUserMessageAt) ?? Number.NEGATIVE_INFINITY;@@ -34,7 +45,7 @@ function getLatestUserMessageTimestamp(thread: ThreadSortInput): number {return latestUserMessageTimestamp;}- return toSortableTimestamp(thread.updatedAt ?? thread.createdAt) ?? Number.NEGATIVE_INFINITY;+ return getFirstSortableTimestamp(thread.updatedAt, thread.createdAt) ?? Number.NEGATIVE_INFINITY;}export function getThreadSortTimestamp(@@ -42,7 +53,9 @@ export function getThreadSortTimestamp(sortOrder: SidebarThreadSortOrder | Exclude<SidebarProjectSortOrder, "manual">,): number {if (sortOrder === "created_at") {- return toSortableTimestamp(thread.createdAt) ?? Number.NEGATIVE_INFINITY;+ return (+ getFirstSortableTimestamp(thread.createdAt, thread.updatedAt) ?? Number.NEGATIVE_INFINITY+ );}return getLatestUserMessageTimestamp(thread);}diff --git a/apps/web/src/uiStateStore.ts b/apps/web/src/uiStateStore.tsindex b76f5f685..f16495bed 100644--- a/apps/web/src/uiStateStore.ts+++ b/apps/web/src/uiStateStore.ts@@ -63,6 +63,7 @@ const initialState: UiState = {const persistedCollapsedProjectCwds = new Set<string>();const persistedExpandedProjectCwds = new Set<string>();const persistedProjectOrderCwds: string[] = [];+const persistedProjectOrderCwdSet = new Set<string>();// Pre-fix persisted shape only listed expanded cwds, so anything not listed// was treated as collapsed. Track whether the loaded blob carried the new// `collapsedProjectCwds` field so we can preserve that legacy semantic for@@ -140,6 +141,7 @@ export function hydratePersistedProjectState(parsed: PersistedUiState): void {persistedCollapsedProjectCwds.clear();persistedExpandedProjectCwds.clear();persistedProjectOrderCwds.length = 0;+ persistedProjectOrderCwdSet.clear();persistedProjectStateUsesLegacyShape = !Array.isArray(parsed.collapsedProjectCwds);for (const cwd of parsed.collapsedProjectCwds ?? []) {if (typeof cwd === "string" && cwd.length > 0) {@@ -152,7 +154,8 @@ export function hydratePersistedProjectState(parsed: PersistedUiState): void {}}for (const cwd of parsed.projectOrderCwds ?? []) {- if (typeof cwd === "string" && cwd.length > 0 && !persistedProjectOrderCwds.includes(cwd)) {+ if (typeof cwd === "string" && cwd.length > 0 && !persistedProjectOrderCwdSet.has(cwd)) {+ persistedProjectOrderCwdSet.add(cwd);persistedProjectOrderCwds.push(cwd);}}@@ -254,14 +257,22 @@ export function syncProjects(state: UiState, projects: readonly SyncProjectInputcurrentLogicalKeyByPhysicalKey.set(project.key, project.logicalKey);}currentProjectCwdsByLogicalKey.clear();+ const currentProjectCwdSetsByLogicalKey = new Map<string, Set<string>>();for (const project of projects) {const cwds = currentProjectCwdsByLogicalKey.get(project.logicalKey);if (cwds) {- if (!cwds.includes(project.cwd)) {+ let cwdSet = currentProjectCwdSetsByLogicalKey.get(project.logicalKey);+ if (!cwdSet) {+ cwdSet = new Set(cwds);+ currentProjectCwdSetsByLogicalKey.set(project.logicalKey, cwdSet);+ }+ if (!cwdSet.has(project.cwd)) {+ cwdSet.add(project.cwd);cwds.push(project.cwd);}} else {currentProjectCwdsByLogicalKey.set(project.logicalKey, [project.cwd]);+ currentProjectCwdSetsByLogicalKey.set(project.logicalKey, new Set([project.cwd]));}}// Build reverse map: for each new logical key, which previous logical keysdiff --git a/packages/shared/src/observability.test.ts b/packages/shared/src/observability.test.tsindex 5e9894550..2943bf46a 100644--- a/packages/shared/src/observability.test.ts+++ b/packages/shared/src/observability.test.ts@@ -1,9 +1,11 @@import { assert, describe, it } from "@effect/vitest";import * as NodeServices from "@effect/platform-node/NodeServices";+import * as Arr from "effect/Array";import * as Effect from "effect/Effect";import * as FileSystem from "effect/FileSystem";import * as Layer from "effect/Layer";import * as Logger from "effect/Logger";+import * as Order from "effect/Order";import * as Path from "effect/Path";import * as References from "effect/References";import * as Schema from "effect/Schema";@@ -170,12 +172,13 @@ describe("observability", () => {}yield* sink.close();- const matchingFiles = (yield* fileSystem.readDirectory(tempDir))- .filter(+ const matchingFiles = Arr.sort(+ (yield* fileSystem.readDirectory(tempDir)).filter((entry) =>entry === "shared.trace.ndjson" || entry.startsWith("shared.trace.ndjson."),- )- .toSorted();+ ),+ Order.String,+ );assert.equal(matchingFiles.some((entry) => entry === "shared.trace.ndjson.1"),