Skip to content

Commit 638670c

Browse files
Clarify workspace picker labels and env mode
- Show current checkout vs current worktree labels consistently - Lock env mode when a server thread is attached to a worktree - Update chat env mode derivation and selection behavior - Adjust picker icon labels and browser test viewport
1 parent 7e88f94 commit 638670c

7 files changed

Lines changed: 85 additions & 25 deletions

‎apps/web/src/components/BranchToolbar.logic.test.ts‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import {
55
deriveLocalBranchNameFromRemoteRef,
66
resolveEnvironmentOptionLabel,
77
resolveBranchSelectionTarget,
8+
resolveCurrentWorkspaceLabel,
89
resolveDraftEnvModeAfterBranchChange,
10+
resolveEffectiveEnvMode,
911
resolveEnvModeLabel,
1012
resolveBranchToolbarValue,
1113
shouldIncludeBranchPickerItem,
@@ -116,13 +118,45 @@ describe("resolveEnvironmentOptionLabel", () => {
116118
});
117119
});
118120

121+
describe("resolveEffectiveEnvMode", () => {
122+
it("treats draft threads already attached to a worktree as current-checkout mode", () => {
123+
expect(
124+
resolveEffectiveEnvMode({
125+
activeWorktreePath: "/repo/.t3/worktrees/feature-a",
126+
hasServerThread: false,
127+
draftThreadEnvMode: "worktree",
128+
}),
129+
).toBe("local");
130+
});
131+
132+
it("keeps explicit new-worktree mode for draft threads without a worktree path", () => {
133+
expect(
134+
resolveEffectiveEnvMode({
135+
activeWorktreePath: null,
136+
hasServerThread: false,
137+
draftThreadEnvMode: "worktree",
138+
}),
139+
).toBe("worktree");
140+
});
141+
});
142+
119143
describe("resolveEnvModeLabel", () => {
120144
it("uses explicit workspace labels", () => {
121145
expect(resolveEnvModeLabel("local")).toBe("Current checkout");
122146
expect(resolveEnvModeLabel("worktree")).toBe("New worktree");
123147
});
124148
});
125149

150+
describe("resolveCurrentWorkspaceLabel", () => {
151+
it("describes the main repo checkout when no worktree path is active", () => {
152+
expect(resolveCurrentWorkspaceLabel(null)).toBe("Current checkout");
153+
});
154+
155+
it("describes the active checkout as a worktree when one is attached", () => {
156+
expect(resolveCurrentWorkspaceLabel("/repo/.t3/worktrees/feature-a")).toBe("Current worktree");
157+
});
158+
});
159+
126160
describe("deriveLocalBranchNameFromRemoteRef", () => {
127161
it("strips the remote prefix from a remote ref", () => {
128162
expect(deriveLocalBranchNameFromRemoteRef("origin/feature/demo")).toBe("feature/demo");

‎apps/web/src/components/BranchToolbar.logic.ts‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,23 @@ export function resolveEnvModeLabel(mode: EnvMode): string {
4646
return mode === "worktree" ? "New worktree" : "Current checkout";
4747
}
4848

49+
export function resolveCurrentWorkspaceLabel(activeWorktreePath: string | null): string {
50+
return activeWorktreePath ? "Current worktree" : resolveEnvModeLabel("local");
51+
}
52+
4953
export function resolveEffectiveEnvMode(input: {
5054
activeWorktreePath: string | null;
5155
hasServerThread: boolean;
5256
draftThreadEnvMode: EnvMode | undefined;
5357
}): EnvMode {
5458
const { activeWorktreePath, hasServerThread, draftThreadEnvMode } = input;
55-
return activeWorktreePath || (!hasServerThread && draftThreadEnvMode === "worktree")
56-
? "worktree"
57-
: "local";
59+
if (!hasServerThread) {
60+
if (activeWorktreePath) {
61+
return "local";
62+
}
63+
return draftThreadEnvMode === "worktree" ? "worktree" : "local";
64+
}
65+
return activeWorktreePath ? "worktree" : "local";
5866
}
5967

6068
export function resolveDraftEnvModeAfterBranchChange(input: {

‎apps/web/src/components/BranchToolbar.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export function BranchToolbar({
6262
hasServerThread: serverThread !== undefined,
6363
draftThreadEnvMode: draftThread?.envMode,
6464
});
65+
const envModeLocked = envLocked || (serverThread !== undefined && activeWorktreePath !== null);
6566

6667
const showEnvironmentPicker =
6768
availableEnvironments && availableEnvironments.length > 1 && onEnvironmentChange;
@@ -83,7 +84,7 @@ export function BranchToolbar({
8384
</>
8485
)}
8586
<BranchToolbarEnvModeSelector
86-
envLocked={envLocked}
87+
envLocked={envModeLocked}
8788
effectiveEnvMode={effectiveEnvMode}
8889
activeWorktreePath={activeWorktreePath}
8990
onEnvModeChange={onEnvModeChange}

‎apps/web/src/components/BranchToolbarEnvModeSelector.tsx‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import { FolderIcon, GitForkIcon } from "lucide-react";
22
import { memo } from "react";
33

4-
import { resolveEnvModeLabel, type EnvMode } from "./BranchToolbar.logic";
4+
import {
5+
resolveCurrentWorkspaceLabel,
6+
resolveEnvModeLabel,
7+
type EnvMode,
8+
} from "./BranchToolbar.logic";
59
import {
610
Select,
711
SelectGroup,
@@ -30,18 +34,18 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
3034
activeWorktreePath,
3135
onEnvModeChange,
3236
}: BranchToolbarEnvModeSelectorProps) {
33-
if (envLocked || activeWorktreePath) {
37+
if (envLocked) {
3438
return (
3539
<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">
3640
{activeWorktreePath ? (
3741
<>
3842
<GitForkIcon className="size-3" />
39-
Worktree
43+
{resolveCurrentWorkspaceLabel(activeWorktreePath)}
4044
</>
4145
) : (
4246
<>
4347
<FolderIcon className="size-3" />
44-
{resolveEnvModeLabel("local")}
48+
{resolveCurrentWorkspaceLabel(activeWorktreePath)}
4549
</>
4650
)}
4751
</span>
@@ -55,7 +59,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
5559
items={envModeItems}
5660
>
5761
<SelectTrigger variant="ghost" size="xs" className="font-medium" aria-label="Workspace">
58-
{effectiveEnvMode === "worktree" ? (
62+
{effectiveEnvMode === "worktree" || activeWorktreePath ? (
5963
<GitForkIcon className="size-3" />
6064
) : (
6165
<FolderIcon className="size-3" />
@@ -67,8 +71,12 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
6771
<SelectGroupLabel>Workspace</SelectGroupLabel>
6872
<SelectItem value="local">
6973
<span className="inline-flex items-center gap-1.5">
70-
<FolderIcon className="size-3" />
71-
{resolveEnvModeLabel("local")}
74+
{activeWorktreePath ? (
75+
<GitForkIcon className="size-3" />
76+
) : (
77+
<FolderIcon className="size-3" />
78+
)}
79+
{resolveCurrentWorkspaceLabel(activeWorktreePath)}
7280
</span>
7381
</SelectItem>
7482
<SelectItem value="worktree">

‎apps/web/src/components/BranchToolbarEnvironmentSelector.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { EnvironmentId } from "@t3tools/contracts";
2-
import { MonitorIcon, ServerIcon } from "lucide-react";
2+
import { CloudIcon, MonitorIcon } from "lucide-react";
33
import { memo, useMemo } from "react";
44

55
import type { EnvironmentOption } from "./BranchToolbar.logic";
@@ -45,7 +45,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
4545
{activeEnvironment?.isPrimary ? (
4646
<MonitorIcon className="size-3" />
4747
) : (
48-
<ServerIcon className="size-3" />
48+
<CloudIcon className="size-3" />
4949
)}
5050
{activeEnvironment?.label ?? "Run on"}
5151
</span>
@@ -62,7 +62,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
6262
{activeEnvironment?.isPrimary ? (
6363
<MonitorIcon className="size-3" />
6464
) : (
65-
<ServerIcon className="size-3" />
65+
<CloudIcon className="size-3" />
6666
)}
6767
<SelectValue />
6868
</SelectTrigger>
@@ -75,7 +75,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
7575
{env.isPrimary ? (
7676
<MonitorIcon className="size-3" />
7777
) : (
78-
<ServerIcon className="size-3" />
78+
<CloudIcon className="size-3" />
7979
)}
8080
{env.label}
8181
</span>

‎apps/web/src/components/ChatView.browser.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1993,7 +1993,7 @@ describe("ChatView timeline estimator parity (full app)", () => {
19931993
});
19941994

19951995
const mounted = await mountChatView({
1996-
viewport: DEFAULT_VIEWPORT,
1996+
viewport: WIDE_FOOTER_VIEWPORT,
19971997
snapshot: withProjectScripts(createDraftOnlySnapshot(), [
19981998
{
19991999
id: "setup",

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ import { ComposerPrimaryActions } from "./chat/ComposerPrimaryActions";
187187
import { ComposerPendingApprovalPanel } from "./chat/ComposerPendingApprovalPanel";
188188
import { ComposerPendingUserInputPanel } from "./chat/ComposerPendingUserInputPanel";
189189
import { ComposerPlanFollowUpBanner } from "./chat/ComposerPlanFollowUpBanner";
190-
import { resolveEnvironmentOptionLabel } from "./BranchToolbar.logic";
190+
import { resolveEffectiveEnvMode, resolveEnvironmentOptionLabel } from "./BranchToolbar.logic";
191191
import {
192192
getComposerProviderState,
193193
renderProviderTraitsMenuContent,
@@ -2894,12 +2894,12 @@ export default function ChatView(props: ChatViewProps) {
28942894
return () => window.removeEventListener("keydown", onKeyDown);
28952895
}, [closeExpandedImage, expandedImage, navigateExpandedImage]);
28962896

2897-
const activeWorktreePath = activeThread?.worktreePath;
2898-
const envMode: DraftThreadEnvMode = activeWorktreePath
2899-
? "worktree"
2900-
: isLocalDraftThread
2901-
? (draftThread?.envMode ?? "local")
2902-
: "local";
2897+
const activeWorktreePath = activeThread?.worktreePath ?? null;
2898+
const envMode: DraftThreadEnvMode = resolveEffectiveEnvMode({
2899+
activeWorktreePath,
2900+
hasServerThread: isServerThread,
2901+
draftThreadEnvMode: isLocalDraftThread ? draftThread?.envMode : undefined,
2902+
});
29032903

29042904
useEffect(() => {
29052905
if (!activeThreadId) {
@@ -4035,11 +4035,20 @@ export default function ChatView(props: ChatViewProps) {
40354035
const onEnvModeChange = useCallback(
40364036
(mode: DraftThreadEnvMode) => {
40374037
if (isLocalDraftThread) {
4038-
setDraftThreadContext(composerDraftTarget, { envMode: mode });
4038+
setDraftThreadContext(composerDraftTarget, {
4039+
envMode: mode,
4040+
...(mode === "worktree" && draftThread?.worktreePath ? { worktreePath: null } : {}),
4041+
});
40394042
}
40404043
scheduleComposerFocus();
40414044
},
4042-
[composerDraftTarget, isLocalDraftThread, scheduleComposerFocus, setDraftThreadContext],
4045+
[
4046+
composerDraftTarget,
4047+
draftThread?.worktreePath,
4048+
isLocalDraftThread,
4049+
scheduleComposerFocus,
4050+
setDraftThreadContext,
4051+
],
40434052
);
40444053

40454054
const applyPromptReplacement = useCallback(

0 commit comments

Comments
 (0)