@@ -44,6 +44,7 @@ import { Separator } from "./ui/separator";
4444interface BranchToolbarProps {
4545 environmentId : EnvironmentId ;
4646 threadId : ThreadId ;
47+ showGitControls : boolean ;
4748 draftId ?: DraftId ;
4849 onEnvModeChange : ( mode : EnvMode ) => void ;
4950 effectiveEnvModeOverride ?: EnvMode ;
@@ -309,6 +310,7 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
309310export const BranchToolbar = memo ( function BranchToolbar ( {
310311 environmentId,
311312 threadId,
313+ showGitControls,
312314 draftId,
313315 onEnvModeChange,
314316 effectiveEnvModeOverride,
@@ -403,7 +405,7 @@ export const BranchToolbar = memo(function BranchToolbar({
403405 data-compact = { labelsOverflow ? "" : undefined }
404406 className = "chat-composer-context-strip group/composer-context -mt-4 mx-auto flex w-[calc(100%-2.75rem)] max-w-[calc(48rem-2.75rem)] items-center gap-2 ps-1 pe-2 pt-5 pb-1"
405407 >
406- { isMobile ? (
408+ { isMobile && showGitControls ? (
407409 < MobileRunContextSelector
408410 envLocked = { envLocked }
409411 envModeLocked = { envModeLocked }
@@ -428,34 +430,40 @@ export const BranchToolbar = memo(function BranchToolbar({
428430 availableEnvironments = { availableEnvironments }
429431 { ...( showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : { } ) }
430432 />
431- < Separator orientation = "vertical" className = "mx-0.5 h-3.5!" />
433+ { showGitControls ? (
434+ < Separator orientation = "vertical" className = "mx-0.5 h-3.5!" />
435+ ) : null }
432436 </ >
433437 ) }
434- < BranchToolbarEnvModeSelector
435- envLocked = { envModeLocked }
436- effectiveEnvMode = { effectiveEnvMode }
437- activeWorktreePath = { activeWorktreePath }
438- onEnvModeChange = { onEnvModeChange }
439- previousWorktreeLabel = { previousWorktreeLabel }
440- onUsePreviousWorktree = { onUsePreviousWorktree }
441- />
438+ { showGitControls ? (
439+ < BranchToolbarEnvModeSelector
440+ envLocked = { envModeLocked }
441+ effectiveEnvMode = { effectiveEnvMode }
442+ activeWorktreePath = { activeWorktreePath }
443+ onEnvModeChange = { onEnvModeChange }
444+ previousWorktreeLabel = { previousWorktreeLabel }
445+ onUsePreviousWorktree = { onUsePreviousWorktree }
446+ />
447+ ) : null }
442448 </ div >
443449 ) }
444450
445- < BranchToolbarBranchSelector
446- className = "min-w-0 flex-1 justify-end md:ml-auto md:flex-none"
447- environmentId = { environmentId }
448- threadId = { threadId }
449- { ...( draftId ? { draftId } : { } ) }
450- envLocked = { envLocked }
451- { ...( effectiveEnvModeOverride ? { effectiveEnvModeOverride } : { } ) }
452- { ...( activeThreadBranchOverride !== undefined ? { activeThreadBranchOverride } : { } ) }
453- { ...( onActiveThreadBranchOverrideChange ? { onActiveThreadBranchOverrideChange } : { } ) }
454- startFromOrigin = { startFromOrigin }
455- onStartFromOriginChange = { onStartFromOriginChange }
456- { ...( onCheckoutPullRequestRequest ? { onCheckoutPullRequestRequest } : { } ) }
457- { ...( onComposerFocusRequest ? { onComposerFocusRequest } : { } ) }
458- />
451+ { showGitControls ? (
452+ < BranchToolbarBranchSelector
453+ className = "min-w-0 flex-1 justify-end md:ml-auto md:flex-none"
454+ environmentId = { environmentId }
455+ threadId = { threadId }
456+ { ...( draftId ? { draftId } : { } ) }
457+ envLocked = { envLocked }
458+ { ...( effectiveEnvModeOverride ? { effectiveEnvModeOverride } : { } ) }
459+ { ...( activeThreadBranchOverride !== undefined ? { activeThreadBranchOverride } : { } ) }
460+ { ...( onActiveThreadBranchOverrideChange ? { onActiveThreadBranchOverrideChange } : { } ) }
461+ startFromOrigin = { startFromOrigin }
462+ onStartFromOriginChange = { onStartFromOriginChange }
463+ { ...( onCheckoutPullRequestRequest ? { onCheckoutPullRequestRequest } : { } ) }
464+ { ...( onComposerFocusRequest ? { onComposerFocusRequest } : { } ) }
465+ />
466+ ) : null }
459467 </ div >
460468 ) ;
461469} ) ;
0 commit comments