Commit 93af851dc53e950673dacc1fb79c2bd95a8b6a9d | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-03-03 09:55:52-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-03-03 10:01:18-08:00
log	93af851dc53e950673dacc1fb79c2bd95a8b6a9d
tree	d1b80f4a1d1af8d0460749381d3fe6f000c27279
parent	fabb3e07348eb864d6a2c33234db1afb59c7e310

type

3 files changed, 27 insertions(+), 11 deletions(-)

apps
- web
  - src
    components
    BranchToolbar.logic.ts
    BranchToolbar.tsx
    BranchToolbarBranchSelector.tsx

apps/web/src/components/BranchToolbar.logic.ts+5-3

...	...	@@ -1,10 +1,12 @@
1	1	import type { GitBranch } from "@t3tools/contracts";
2	2
	3	export type EnvMode = "local" \| "worktree";
	4
3	5	export function resolveDraftEnvModeAfterBranchChange(input: {
4	6	nextWorktreePath: string \| null;
5	7	currentWorktreePath: string \| null;
6		effectiveEnvMode: "local" \| "worktree";
7		}): "local" \| "worktree" {
	8	effectiveEnvMode: EnvMode;
	9	}): EnvMode {
8	10	const { nextWorktreePath, currentWorktreePath, effectiveEnvMode } = input;
9	11	if (nextWorktreePath) {
10	12	return "worktree";
...	...	@@ -16,7 +18,7 @@ export function resolveDraftEnvModeAfterBranchChange(input: {
16	18	}
17	19
18	20	export function resolveBranchToolbarValue(input: {
19		envMode: "local" \| "worktree";
	21	envMode: EnvMode;
20	22	activeWorktreePath: string \| null;
21	23	activeThreadBranch: string \| null;
22	24	currentGitBranch: string \| null;

apps/web/src/components/BranchToolbar.tsx+4-4

...	...	@@ -5,14 +5,14 @@ import { newCommandId } from "../lib/utils";
5	5	import { readNativeApi } from "../nativeApi";
6	6	import { useComposerDraftStore } from "../composerDraftStore";
7	7	import { useStore } from "../store";
8		import { resolveDraftEnvModeAfterBranchChange } from "./BranchToolbar.logic";
	8	import { EnvMode, resolveDraftEnvModeAfterBranchChange } from "./BranchToolbar.logic";
9	9	import { BranchToolbarBranchSelector } from "./BranchToolbarBranchSelector";
10	10	import { Button } from "./ui/button";
11	11
12	12	interface BranchToolbarProps {
13	13	threadId: ThreadId;
14		envMode: "local" \| "worktree";
15		onEnvModeChange: (mode: "local" \| "worktree") => void;
	14	envMode: EnvMode;
	15	onEnvModeChange: (mode: EnvMode) => void;
16	16	envLocked: boolean;
17	17	onComposerFocusRequest?: () => void;
18	18	}
...	...	@@ -38,7 +38,7 @@ export default function BranchToolbar({
38	38	const activeWorktreePath = serverThread?.worktreePath ?? draftThread?.worktreePath ?? null;
39	39	const branchCwd = activeWorktreePath ?? activeProject?.cwd ?? null;
40	40	const hasServerThread = serverThread !== undefined;
41		const effectiveEnvMode: "local" \| "worktree" =
	41	const effectiveEnvMode: EnvMode =
42	42	activeWorktreePath \|\| (!hasServerThread && draftThread?.envMode === "worktree")
43	43	? "worktree"
44	44	: envMode;

apps/web/src/components/BranchToolbarBranchSelector.tsx+18-4

...	...	@@ -2,13 +2,22 @@ import type { GitBranch } from "@t3tools/contracts";
2	2	import { useQuery, useQueryClient } from "@tanstack/react-query";
3	3	import { useVirtualizer } from "@tanstack/react-virtual";
4	4	import { ChevronDownIcon } from "lucide-react";
5		import { useCallback, useEffect, useMemo, useOptimistic, useRef, useState, useTransition } from "react";
	5	import {
	6	useCallback,
	7	useEffect,
	8	useMemo,
	9	useOptimistic,
	10	useRef,
	11	useState,
	12	useTransition,
	13	} from "react";
6	14
7	15	import { gitBranchesQueryOptions, gitQueryKeys, invalidateGitQueries } from "../lib/gitReactQuery";
8	16	import { readNativeApi } from "../nativeApi";
9	17	import {
10	18	dedupeRemoteBranchesWithLocalMatches,
11	19	deriveLocalBranchNameFromRemoteRef,
	20	EnvMode,
12	21	resolveBranchToolbarValue,
13	22	} from "./BranchToolbar.logic";
14	23	import { Button } from "./ui/button";
...	...	@@ -28,7 +37,7 @@ interface BranchToolbarBranchSelectorProps {
28	37	activeThreadBranch: string \| null;
29	38	activeWorktreePath: string \| null;
30	39	branchCwd: string \| null;
31		effectiveEnvMode: "local" \| "worktree";
	40	effectiveEnvMode: EnvMode;
32	41	envLocked: boolean;
33	42	onSetThreadBranch: (branch: string \| null, worktreePath: string \| null) => void;
34	43	onComposerFocusRequest?: () => void;
...	...	@@ -40,7 +49,7 @@ function toBranchActionErrorMessage(error: unknown): string {
40	49
41	50	function getBranchTriggerLabel(input: {
42	51	activeWorktreePath: string \| null;
43		effectiveEnvMode: "local" \| "worktree";
	52	effectiveEnvMode: EnvMode;
44	53	resolvedActiveBranch: string \| null;
45	54	}): string {
46	55	const { activeWorktreePath, effectiveEnvMode, resolvedActiveBranch } = input;
...	...	@@ -215,7 +224,12 @@ export function BranchToolbarBranchSelector({
215	224	};
216	225
217	226	useEffect(() => {
218		if (effectiveEnvMode !== "worktree" \|\| activeWorktreePath \|\| activeThreadBranch \|\| !currentGitBranch) {
	227	if (
	228	effectiveEnvMode !== "worktree" \|\|
	229	activeWorktreePath \|\|
	230	activeThreadBranch \|\|
	231	!currentGitBranch
	232	) {
219	233	return;
220	234	}
221	235	onSetThreadBranch(currentGitBranch, null);