Clarify environment and workspace picker labels

[juliusmarminge]

Summary

• Clarify environment picker labels so the primary device reads as This device unless a more specific machine label is available.
• Add grouped labels and clearer icons to the environment and workspace selectors.
• Centralize label resolution logic in BranchToolbar.logic and cover the new behavior with tests.
• Update the chat view to use the shared environment label resolution helper.

Testing

• Added unit coverage in apps/web/src/components/BranchToolbar.logic.test.ts for environment and workspace label resolution.
• Not run: bun fmt
• Not run: bun lint
• Not run: bun typecheck
• Not run: bun run test

---

Note

Medium Risk
Changes the logic that derives effective environment/worktree mode and mutates draft thread context (clearing worktreePath when switching to worktree), which could affect thread/worktree selection flows. UI label/icon updates are low risk but touch widely used toolbar components.

Overview
Clarifies the branch toolbar’s environment and workspace pickers by centralizing label resolution in BranchToolbar.logic (primary environment now shows a device-specific label or This device; workspace labels become Current checkout/Current worktree/New worktree) and updating selectors with grouped menus, new icons, and improved aria-labels.

Refines resolveEffectiveEnvMode so draft threads already attached to a worktree are treated as local (current checkout), while preserving explicit new-worktree intent when no worktree exists; BranchToolbar also now locks the env-mode selector when a server thread has an attached worktree. ChatView adopts the shared helpers and now clears a draft’s worktreePath when switching to worktree mode; adds unit coverage for the new label and env-mode behavior.

^{Reviewed by Cursor Bugbot for commit 72cb14f. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Clarify environment and workspace picker labels in the branch toolbar

• Replaces generic environment labels with context-aware ones: primary environments show a machine name or fall back to 'This device'; non-primary environments use configured or runtime labels before falling back to the environment ID.
• Adds resolveEnvModeLabel and resolveCurrentWorkspaceLabel helpers so the env mode selector shows 'Current checkout', 'Current worktree', or 'New worktree' depending on context.
• Updates icons: MonitorIcon for primary environments, CloudIcon for remote, and folder-based icons in the env mode selector.
• Draft threads with an attached worktree path are now treated as local mode instead of worktree; switching to worktree mode clears any existing worktreePath.
• The env mode selector becomes read-only when on a server thread attached to a worktree, even if envLocked is false.

^{Macroscope summarized 72cb14f.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 2376f974-b9fd-40fc-960d-19d3e1b7c069

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch t3code/clarify-picker-labels

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR modifies runtime behavior beyond just label clarifications - it changes how environment modes are determined and locked, and there's an unresolved bug comment about label mismatches between the trigger and dropdown options that should be addressed before merging.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate 638670c

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Static items label mismatches dynamic dropdown item label
  • Moved envModeItems from a static module-level constant into the component as a useMemo dependent on activeWorktreePath, using resolveCurrentWorkspaceLabel() for the local item label so the trigger and dropdown labels always match.

Or push these changes by commenting:

@cursor push a77a4b5975

Preview (a77a4b5975)

diff --git a/apps/web/src/components/BranchToolbarEnvModeSelector.tsx b/apps/web/src/components/BranchToolbarEnvModeSelector.tsx
--- a/apps/web/src/components/BranchToolbarEnvModeSelector.tsx
+++ b/apps/web/src/components/BranchToolbarEnvModeSelector.tsx
@@ -1,5 +1,5 @@
 import { FolderIcon, GitForkIcon } from "lucide-react";
-import { memo } from "react";
+import { memo, useMemo } from "react";
 
 import {
   resolveCurrentWorkspaceLabel,
@@ -16,11 +16,6 @@
   SelectValue,
 } from "./ui/select";
 
-const envModeItems = [
-  { value: "local", label: resolveEnvModeLabel("local") },
-  { value: "worktree", label: resolveEnvModeLabel("worktree") },
-] as const;
-
 interface BranchToolbarEnvModeSelectorProps {
   envLocked: boolean;
   effectiveEnvMode: EnvMode;
@@ -34,6 +29,14 @@
   activeWorktreePath,
   onEnvModeChange,
 }: BranchToolbarEnvModeSelectorProps) {
+  const envModeItems = useMemo(
+    () => [
+      { value: "local" as const, label: resolveCurrentWorkspaceLabel(activeWorktreePath) },
+      { value: "worktree" as const, label: resolveEnvModeLabel("worktree") },
+    ],
+    [activeWorktreePath],
+  );
+
   if (envLocked) {
     return (
       <span className="inline-flex items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:text-xs">

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 638670c. Configure here.}