Merge staging worktree label into main

Author: J-Giggles

apps/web/src/components/Sidebar.logic.test.ts

@@ -13,6 +13,7 @@ import {
   isContextMenuPointerDown,
   orderItemsByPreferredIds,
   resolveProjectStatusIndicator,
+  resolveRunningWorktreeSlug,
   resolveSidebarNewThreadSeedContext,
   resolveSidebarNewThreadEnvMode,
   resolveThreadRowClassName,
@@ -37,6 +38,24 @@ import {
 
 const localEnvironmentId = EnvironmentId.make("environment-local");
 
+describe("resolveRunningWorktreeSlug", () => {
+  it("returns the directory after .worktrees for POSIX paths", () => {
+    expect(resolveRunningWorktreeSlug("/home/jgigg/code/t3code/.worktrees/staging")).toBe(
+      "staging",
+    );
+  });
+
+  it("returns the directory after .worktrees for Windows paths", () => {
+    expect(resolveRunningWorktreeSlug("C:\\Users\\jgigg\\code\\t3code\\.worktrees\\staging")).toBe(
+      "staging",
+    );
+  });
+
+  it("returns null for a main checkout outside .worktrees", () => {
+    expect(resolveRunningWorktreeSlug("/home/jgigg/code/t3code")).toBeNull();
+  });
+});
+
 function makeLatestTurn(overrides?: {
   completedAt?: string | null;
   startedAt?: string | null;

apps/web/src/components/Sidebar.logic.ts

@@ -23,6 +23,20 @@ type SidebarProject = {
   updatedAt?: string | undefined;
 };
 
+export function resolveRunningWorktreeSlug(cwd: string | null | undefined): string | null {
+  const segments = cwd
+    ?.trim()
+    .split(/[\\/]+/)
+    .filter((segment) => segment.length > 0);
+  if (!segments || segments.length === 0) {
+    return null;
+  }
+
+  const worktreesIndex = segments.lastIndexOf(".worktrees");
+  const slug = worktreesIndex >= 0 ? segments[worktreesIndex + 1] : undefined;
+  return slug && slug.length > 0 ? slug : null;
+}
+
 export type ThreadTraversalDirection = "previous" | "next";
 
 export interface ThreadStatusPill {

apps/web/src/components/Sidebar.tsx

@@ -167,6 +167,7 @@ import {
   resolveProjectStatusIndicator,
   resolveSidebarNewThreadSeedContext,
   resolveSidebarNewThreadEnvMode,
+  resolveRunningWorktreeSlug,
   resolveThreadRowClassName,
   resolveThreadStatusPill,
   orderItemsByPreferredIds,
@@ -181,7 +182,7 @@ import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
 import { CommandDialogTrigger } from "./ui/command";
 import { readEnvironmentApi } from "../environmentApi";
 import { useSettings, useUpdateSettings } from "~/hooks/useSettings";
-import { useServerKeybindings } from "../rpc/serverState";
+import { useServerConfig, useServerKeybindings } from "../rpc/serverState";
 import {
   derivePhysicalProjectKey,
   deriveProjectGroupingOverrideKey,
@@ -2511,6 +2512,8 @@ const SidebarChromeHeader = memo(function SidebarChromeHeader({
 }: {
   isElectron: boolean;
 }) {
+  const serverConfig = useServerConfig();
+  const runningWorktreeSlug = resolveRunningWorktreeSlug(serverConfig?.cwd);
   const wordmark = (
     <div className="flex items-center gap-2">
       <SidebarTrigger className="shrink-0 md:hidden" />
@@ -2529,11 +2532,21 @@ const SidebarChromeHeader = memo(function SidebarChromeHeader({
               <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}
               </span>
+              {runningWorktreeSlug ? (
+                <span className="max-w-24 truncate rounded-full bg-muted/70 px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground/70">
+                  {runningWorktreeSlug}
+                </span>
+              ) : null}
             </Link>
           }
         />
         <TooltipPopup side="bottom" sideOffset={2}>
-          Version {APP_VERSION}
+          <span className="block">Version {APP_VERSION}</span>
+          {runningWorktreeSlug && serverConfig?.cwd ? (
+            <span className="block max-w-80 truncate text-muted-foreground">
+              Worktree: {serverConfig.cwd}
+            </span>
+          ) : null}
         </TooltipPopup>
       </Tooltip>
     </div>