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.
[codex] fix: show nightly badge from primary web server version (#3103)
Wout Stiens7dc182337cfd
diff --git a/apps/web/src/components/Sidebar.logic.test.ts b/apps/web/src/components/Sidebar.logic.test.tsindex b1c29888f..574e33d4d 100644--- a/apps/web/src/components/Sidebar.logic.test.ts+++ b/apps/web/src/components/Sidebar.logic.test.ts@@ -14,6 +14,7 @@ import {resolveProjectStatusIndicator,resolveSidebarNewThreadSeedContext,resolveSidebarNewThreadEnvMode,+ resolveSidebarStageBadgeLabel,resolveThreadRowClassName,resolveThreadStatusPill,shouldClearThreadSelectionOnMouseDown,@@ -36,6 +37,44 @@ import {const localEnvironmentId = EnvironmentId.make("environment-local");+describe("resolveSidebarStageBadgeLabel", () => {+ it("returns Nightly for nightly primary server versions", () => {+ expect(+ resolveSidebarStageBadgeLabel({+ primaryServerVersion: "0.0.28-nightly.20260616.12",+ fallbackStageLabel: "Alpha",+ }),+ ).toBe("Nightly");+ });++ it("returns the fallback label for stable primary server versions", () => {+ expect(+ resolveSidebarStageBadgeLabel({+ primaryServerVersion: "0.0.27",+ fallbackStageLabel: "Alpha",+ }),+ ).toBe("Alpha");+ });++ it("returns the fallback label when the primary server version is missing", () => {+ expect(+ resolveSidebarStageBadgeLabel({+ primaryServerVersion: null,+ fallbackStageLabel: "Dev",+ }),+ ).toBe("Dev");+ });++ it("returns the fallback label for malformed nightly prerelease versions", () => {+ expect(+ resolveSidebarStageBadgeLabel({+ primaryServerVersion: "0.0.28-nightly.20260616",+ fallbackStageLabel: "Alpha",+ }),+ ).toBe("Alpha");+ });+});+function makeLatestTurn(overrides?: {completedAt?: string | null;startedAt?: string | null;diff --git a/apps/web/src/components/Sidebar.logic.ts b/apps/web/src/components/Sidebar.logic.tsindex f628e21e4..5c70d447d 100644--- a/apps/web/src/components/Sidebar.logic.ts+++ b/apps/web/src/components/Sidebar.logic.ts@@ -12,6 +12,7 @@ import { isLatestTurnSettled } from "../session-logic";export const THREAD_SELECTION_SAFE_SELECTOR = "[data-thread-item], [data-thread-selection-safe]";export const THREAD_JUMP_HINT_SHOW_DELAY_MS = 100;+const NIGHTLY_SERVER_VERSION_PATTERN = /-nightly\.\d{8}\.\d+$/;// Visible sidebar rows are prewarmed into the thread-detail cache so opening a// nearby thread usually reuses an already-hot subscription.export const SIDEBAR_THREAD_PREWARM_LIMIT = 10;@@ -64,6 +65,16 @@ export interface ThreadJumpHintVisibilityController {dispose: () => void;}+export function resolveSidebarStageBadgeLabel(input: {+ primaryServerVersion: string | null | undefined;+ fallbackStageLabel: string;+}): string {+ return input.primaryServerVersion &&+ NIGHTLY_SERVER_VERSION_PATTERN.test(input.primaryServerVersion)+ ? "Nightly"+ : input.fallbackStageLabel;+}+export function createThreadJumpHintVisibilityController(input: {delayMs: number;onVisibilityChange: (visible: boolean) => void;diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsxindex 1b46b0f1d..517738632 100644--- a/apps/web/src/components/Sidebar.tsx+++ b/apps/web/src/components/Sidebar.tsx@@ -188,6 +188,7 @@ import {orderItemsByPreferredIds,shouldClearThreadSelectionOnMouseDown,sortProjectsForSidebar,+ resolveSidebarStageBadgeLabel,useThreadJumpHintVisibility,ThreadStatusPill,} from "./Sidebar.logic";@@ -197,7 +198,7 @@ import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";import { useIsMobile } from "~/hooks/useMediaQuery";import { CommandDialogTrigger } from "./ui/command";import { useSettings, useUpdateSettings } from "~/hooks/useSettings";-import { primaryServerKeybindingsAtom } from "../state/server";+import { primaryServerConfigAtom, primaryServerKeybindingsAtom } from "../state/server";import {derivePhysicalProjectKey,deriveProjectGroupingOverrideKey,@@ -2680,6 +2681,12 @@ const SidebarChromeHeader = memo(function SidebarChromeHeader({}: {isElectron: boolean;}) {+ const primaryServerVersion =+ useAtomValue(primaryServerConfigAtom)?.environment.serverVersion ?? null;+ const stageBadgeLabel = resolveSidebarStageBadgeLabel({+ primaryServerVersion,+ fallbackStageLabel: APP_STAGE_LABEL,+ });const wordmark = (<div className="flex items-center gap-2"><SidebarTrigger className="shrink-0 md:hidden" />@@ -2696,7 +2703,7 @@ const SidebarChromeHeader = memo(function SidebarChromeHeader({Code</span><span className="rounded-full bg-muted/50 px-1.5 py-0.5 text-[8px] font-medium uppercase tracking-[0.18em] text-muted-foreground/60">- {APP_STAGE_LABEL}+ {stageBadgeLabel}</span></Link>}