[DO NOT MERGE] feat(web): add context picker slash commands#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sameerr03 wants to merge 1 commit into
base:personal/v1-efficiency-base
Choose a base branch
from
Draft

[DO NOT MERGE] feat(web): add context picker slash commands #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 59 additions & 2 deletions apps/web/src/components/BranchToolbar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
} from "lucide-react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import type { ComposerContextPicker } from "../composer-logic";
import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
import { useIsMobile } from "../hooks/useMediaQuery";
Expand DownExpand Up@@ -57,6 +58,8 @@ interface BranchToolbarProps {
onComposerFocusRequest?: () => void;
availableEnvironments?: readonly EnvironmentOption[];
onEnvironmentChange?: (environmentId: EnvironmentId) => void;
contextPickerRequest?: { readonly picker: ComposerContextPicker; readonly id: number } | null;
onContextPickerRequestHandled?: (requestId: number) => void;
}

interface MobileRunContextSelectorProps {
Expand All@@ -72,6 +75,9 @@ interface MobileRunContextSelectorProps {
onEnvModeChange: (mode: EnvMode) => void;
previousWorktreeLabel: string | null;
onUsePreviousWorktree: () => void;
openRequestId?: number | null;
onPickerClose?: () => void;
onOpenRequestHandled?: (requestId: number) => void;
}

const MobileRunContextSelector = memo(function MobileRunContextSelector({
Expand All@@ -87,7 +93,19 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
onEnvModeChange,
previousWorktreeLabel,
onUsePreviousWorktree,
openRequestId,
onPickerClose,
onOpenRequestHandled,
}: MobileRunContextSelectorProps) {
const [open, setOpen] = useState(false);
const openedFromRequestRef = useRef(false);
useEffect(() => {
if (openRequestId !== null && openRequestId !== undefined) {
openedFromRequestRef.current = true;
setOpen(true);
onOpenRequestHandled?.(openRequestId);
}
}, [onOpenRequestHandled, openRequestId]);
const activeEnvironment = useMemo(
() => availableEnvironments?.find((env) => env.environmentId === environmentId) ?? null,
[availableEnvironments, environmentId],
Expand All@@ -103,7 +121,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
: effectiveEnvMode === "worktree"
? resolveEnvModeLabel("worktree")
: resolveCurrentWorkspaceLabel(activeWorktreePath);
const isLocked = envLocked || envModeLocked;
const isLocked = envLocked && envModeLocked;
const EnvironmentIcon = activeEnvironment?.isPrimary ? MonitorIcon : CloudIcon;
const icon = showEnvironmentIndicator ? (
// Button's base styles apply `-mx-0.5` to descendant SVGs, which eats 4px
Expand DownExpand Up@@ -133,7 +151,16 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
}

return (
<Menu>
<Menu
open={open}
onOpenChange={(nextOpen) => {
setOpen(nextOpen);
if (!nextOpen && openedFromRequestRef.current) {
openedFromRequestRef.current = false;
onPickerClose?.();
}
}}
>
<MenuTrigger
render={<Button variant="ghost" size="xs" />}
className="min-w-0 max-w-[48%] flex-1 justify-start text-muted-foreground/70 hover:text-foreground/80 md:hidden"
Expand DownExpand Up@@ -389,6 +416,8 @@ export const BranchToolbar = memo(function BranchToolbar({
onComposerFocusRequest,
availableEnvironments,
onEnvironmentChange,
contextPickerRequest,
onContextPickerRequestHandled,
}: BranchToolbarProps) {
const threadRef = useMemo(
() => scopeThreadRef(environmentId, threadId),
Expand DownExpand Up@@ -485,6 +514,16 @@ export const BranchToolbar = memo(function BranchToolbar({
onEnvModeChange={onEnvModeChange}
previousWorktreeLabel={previousWorktreeLabel}
onUsePreviousWorktree={onUsePreviousWorktree}
openRequestId={
contextPickerRequest?.picker === "environment" ||
contextPickerRequest?.picker === "worktree"
? contextPickerRequest.id
: null
}
{...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
{...(onContextPickerRequestHandled
? { onOpenRequestHandled: onContextPickerRequestHandled }
: {})}
/>
) : (
<div className="flex min-w-0 flex-1 items-center gap-1">
Expand All@@ -495,6 +534,13 @@ export const BranchToolbar = memo(function BranchToolbar({
environmentId={environmentId}
availableEnvironments={availableEnvironments}
{...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
openRequestId={
contextPickerRequest?.picker === "environment" ? contextPickerRequest.id : null
}
{...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
{...(onContextPickerRequestHandled
? { onOpenRequestHandled: onContextPickerRequestHandled }
: {})}
/>
{showGitControls ? (
<Separator
Expand All@@ -513,6 +559,13 @@ export const BranchToolbar = memo(function BranchToolbar({
onEnvModeChange={onEnvModeChange}
previousWorktreeLabel={previousWorktreeLabel}
onUsePreviousWorktree={onUsePreviousWorktree}
openRequestId={
contextPickerRequest?.picker === "worktree" ? contextPickerRequest.id : null
}
{...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
{...(onContextPickerRequestHandled
? { onOpenRequestHandled: onContextPickerRequestHandled }
: {})}
/>
) : null}
</div>
Expand All@@ -532,6 +585,10 @@ export const BranchToolbar = memo(function BranchToolbar({
onStartFromOriginChange={onStartFromOriginChange}
{...(onCheckoutPullRequestRequest ? { onCheckoutPullRequestRequest } : {})}
{...(onComposerFocusRequest ? { onComposerFocusRequest } : {})}
openRequestId={contextPickerRequest?.picker === "branch" ? contextPickerRequest.id : null}
{...(onContextPickerRequestHandled
? { onOpenRequestHandled: onContextPickerRequestHandled }
: {})}
/>
) : null}
</div>
Expand Down
45 changes: 38 additions & 7 deletions apps/web/src/components/BranchToolbarBranchSelector.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ interface BranchToolbarBranchSelectorProps {
onStartFromOriginChange: (startFromOrigin: boolean) => void;
onCheckoutPullRequestRequest?: (reference: string) => void;
onComposerFocusRequest?: () => void;
openRequestId?: number | null;
onOpenRequestHandled?: (requestId: number) => void;
}

function toBranchActionErrorMessage(error: unknown): string {
Expand All@@ -98,6 +100,8 @@ export function BranchToolbarBranchSelector({
onStartFromOriginChange,
onCheckoutPullRequestRequest,
onComposerFocusRequest,
openRequestId,
onOpenRequestHandled,
}: BranchToolbarBranchSelectorProps) {
const startFromOriginSwitchId = useId();
const stopThreadSession = useAtomCommand(threadEnvironment.stopSession, "thread session stop");
Expand DownExpand Up@@ -208,6 +212,8 @@ export function BranchToolbarBranchSelector({
// Git ref queries
// ---------------------------------------------------------------------------
const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
const openedFromRequestRef = useRef(false);
const pendingOpenRequestRef = useRef(false);
const [branchQuery, setBranchQuery] = useState("");
const deferredBranchQuery = useDeferredValue(branchQuery);

Expand DownExpand Up@@ -330,6 +336,19 @@ export function BranchToolbarBranchSelector({
? queriedActiveBranch.isRemote === true
: null;
const [isBranchActionPending, startBranchActionTransition] = useTransition();
useEffect(() => {
if (openRequestId !== null && openRequestId !== undefined) {
openedFromRequestRef.current = true;
pendingOpenRequestRef.current = true;
onOpenRequestHandled?.(openRequestId);
}
}, [onOpenRequestHandled, openRequestId]);
useEffect(() => {
if (pendingOpenRequestRef.current && !isInitialBranchesLoadPending && !isBranchActionPending) {
pendingOpenRequestRef.current = false;
setIsBranchMenuOpen(true);
}
}, [isBranchActionPending, isInitialBranchesLoadPending]);
const totalBranchCount = branchRefState.data?.totalCount ?? 0;
const branchStatusText = isInitialBranchesLoadPending
? "Loading refs..."
Expand DownExpand Up@@ -394,6 +413,7 @@ export function BranchToolbarBranchSelector({

if (isSelectingWorktreeBase) {
setThreadBranch(refName.name, null);
openedFromRequestRef.current = false;
setIsBranchMenuOpen(false);
onComposerFocusRequest?.();
return;
Expand All@@ -407,6 +427,7 @@ export function BranchToolbarBranchSelector({

if (selectionTarget.reuseExistingWorktree) {
setThreadBranch(refName.name, selectionTarget.nextWorktreePath);
openedFromRequestRef.current = false;
setIsBranchMenuOpen(false);
onComposerFocusRequest?.();
return;
Expand All@@ -416,6 +437,7 @@ export function BranchToolbarBranchSelector({
? deriveLocalBranchNameFromRemoteRef(refName.name)
: refName.name;

openedFromRequestRef.current = false;
setIsBranchMenuOpen(false);
onComposerFocusRequest?.();

Expand DownExpand Up@@ -454,6 +476,7 @@ export function BranchToolbarBranchSelector({
const name = sanitizeNewRefName(rawName);
if (!branchCwd || !name || isBranchActionPending) return;

openedFromRequestRef.current = false;
setIsBranchMenuOpen(false);
onComposerFocusRequest?.();

Expand DownExpand Up@@ -519,13 +542,20 @@ export function BranchToolbarBranchSelector({
// ---------------------------------------------------------------------------
const branchListScrollElementRef = useRef<HTMLElement | null>(null);
const previousBranchListScrollTopRef = useRef<number | null>(null);
const handleOpenChange = useCallback((open: boolean) => {
previousBranchListScrollTopRef.current = null;
setIsBranchMenuOpen(open);
if (!open) {
setBranchQuery("");
}
}, []);
const handleOpenChange = useCallback(
(open: boolean) => {
previousBranchListScrollTopRef.current = null;
setIsBranchMenuOpen(open);
if (!open) {
setBranchQuery("");
if (openedFromRequestRef.current) {
openedFromRequestRef.current = false;
onComposerFocusRequest?.();
}
}
},
[onComposerFocusRequest],
);

const [showTopBranchScrollFade, setShowTopBranchScrollFade] = useState(false);
const [showBottomBranchScrollFade, setShowBottomBranchScrollFade] = useState(false);
Expand DownExpand Up@@ -641,6 +671,7 @@ export function BranchToolbarBranchSelector({
if (!prReference || !onCheckoutPullRequestRequest) {
return;
}
openedFromRequestRef.current = false;
setIsBranchMenuOpen(false);
setBranchQuery("");
onComposerFocusRequest?.();
Expand Down
25 changes: 24 additions & 1 deletion apps/web/src/components/BranchToolbarEnvModeSelector.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { FolderGit2Icon, FolderGitIcon, FolderIcon, HistoryIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import {
resolveCurrentWorkspaceLabel,
Expand All@@ -26,6 +26,9 @@ interface BranchToolbarEnvModeSelectorProps {
onEnvModeChange: (mode: EnvMode) => void;
previousWorktreeLabel?: string | null;
onUsePreviousWorktree?: () => void;
openRequestId?: number | null;
onPickerClose?: () => void;
onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSelector({
Expand All@@ -35,7 +38,19 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
onEnvModeChange,
previousWorktreeLabel,
onUsePreviousWorktree,
openRequestId,
onPickerClose,
onOpenRequestHandled,
}: BranchToolbarEnvModeSelectorProps) {
const [open, setOpen] = useState(false);
const openedFromRequestRef = useRef(false);
useEffect(() => {
if (openRequestId !== null && openRequestId !== undefined) {
openedFromRequestRef.current = true;
setOpen(true);
onOpenRequestHandled?.(openRequestId);
}
}, [onOpenRequestHandled, openRequestId]);
const showPreviousWorktree = Boolean(previousWorktreeLabel && onUsePreviousWorktree);
const envModeItems = useMemo(
() => [
Expand DownExpand Up@@ -72,6 +87,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
return (
<Select
modal={false}
open={open}
onOpenChange={(nextOpen) => {
setOpen(nextOpen);
if (!nextOpen && openedFromRequestRef.current) {
openedFromRequestRef.current = false;
onPickerClose?.();
}
}}
value={effectiveEnvMode}
onValueChange={(value: string | null) => {
if (value === PREVIOUS_WORKTREE_SELECT_VALUE) {
Expand Down
25 changes: 24 additions & 1 deletion apps/web/src/components/BranchToolbarEnvironmentSelector.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { EnvironmentId } from "@t3tools/contracts";
import { CloudIcon, MonitorIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import type { EnvironmentOption } from "./BranchToolbar.logic";
import {
Expand All@@ -20,14 +20,29 @@ interface BranchToolbarEnvironmentSelectorProps {
// Absent when there is only one environment to show: the indicator still
// renders (as a static label) so remote projects are always identifiable.
onEnvironmentChange?: (environmentId: EnvironmentId) => void;
openRequestId?: number | null;
onPickerClose?: () => void;
onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvironmentSelector({
envLocked,
environmentId,
availableEnvironments,
onEnvironmentChange,
openRequestId,
onPickerClose,
onOpenRequestHandled,
}: BranchToolbarEnvironmentSelectorProps) {
const [open, setOpen] = useState(false);
const openedFromRequestRef = useRef(false);
useEffect(() => {
if (openRequestId !== null && openRequestId !== undefined) {
openedFromRequestRef.current = true;
setOpen(true);
onOpenRequestHandled?.(openRequestId);
}
}, [onOpenRequestHandled, openRequestId]);
const activeEnvironment = useMemo(() => {
return availableEnvironments.find((env) => env.environmentId === environmentId) ?? null;
}, [availableEnvironments, environmentId]);
Expand DownExpand Up@@ -75,6 +90,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
return (
<Select
modal={false}
open={open}
onOpenChange={(nextOpen) => {
setOpen(nextOpen);
if (!nextOpen && openedFromRequestRef.current) {
openedFromRequestRef.current = false;
onPickerClose?.();
}
}}
value={environmentId}
onValueChange={(value) => onEnvironmentChange(value as EnvironmentId)}
items={environmentItems}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[DO NOT MERGE] feat(web): add context picker slash commands#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

sameerr03
wants to merge
1
commit into

base:personal/v1-efficiency-base
Choose a base branch

from

 Draft


[DO NOT MERGE] feat(web): add context picker slash commands
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 59 additions & 2 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
} from "lucide-react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import type { ComposerContextPicker } from "../composer-logic";
import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
import { useIsMobile } from "../hooks/useMediaQuery";
Expand DownExpand Up@@ -57,6 +58,8 @@ interface BranchToolbarProps {
 onComposerFocusRequest?: () => void;
 availableEnvironments?: readonly EnvironmentOption[];
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 contextPickerRequest?: { readonly picker: ComposerContextPicker; readonly id: number } | null;
 onContextPickerRequestHandled?: (requestId: number) => void;
}

interface MobileRunContextSelectorProps {
Expand All@@ -72,6 +75,9 @@ interface MobileRunContextSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel: string | null;
 onUsePreviousWorktree: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

const MobileRunContextSelector = memo(function MobileRunContextSelector({
Expand All@@ -87,7 +93,19 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: MobileRunContextSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(
 () => availableEnvironments?.find((env) => env.environmentId === environmentId) ?? null,
 [availableEnvironments, environmentId],
Expand All@@ -103,7 +121,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 : effectiveEnvMode === "worktree"
 ? resolveEnvModeLabel("worktree")
 : resolveCurrentWorkspaceLabel(activeWorktreePath);
 const isLocked = envLocked || envModeLocked;
 const isLocked = envLocked && envModeLocked;
 const EnvironmentIcon = activeEnvironment?.isPrimary ? MonitorIcon : CloudIcon;
 const icon = showEnvironmentIndicator ? (
 // Button's base styles apply `-mx-0.5` to descendant SVGs, which eats 4px
Expand DownExpand Up@@ -133,7 +151,16 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 }

 return (
 <Menu>
 <Menu
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 >
 <MenuTrigger
 render={<Button variant="ghost" size="xs" />}
 className="min-w-0 max-w-[48%] flex-1 justify-start text-muted-foreground/70 hover:text-foreground/80 md:hidden"
Expand DownExpand Up@@ -389,6 +416,8 @@ export const BranchToolbar = memo(function BranchToolbar({
 onComposerFocusRequest,
 availableEnvironments,
 onEnvironmentChange,
 contextPickerRequest,
 onContextPickerRequestHandled,
}: BranchToolbarProps) {
 const threadRef = useMemo(
 () => scopeThreadRef(environmentId, threadId),
Expand DownExpand Up@@ -485,6 +514,16 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "environment" ||
 contextPickerRequest?.picker === "worktree"
 ? contextPickerRequest.id
 : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : (
 <div className="flex min-w-0 flex-1 items-center gap-1">
Expand All@@ -495,6 +534,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 environmentId={environmentId}
 availableEnvironments={availableEnvironments}
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 openRequestId={
 contextPickerRequest?.picker === "environment" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 {showGitControls ? (
 <Separator
Expand All@@ -513,6 +559,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "worktree" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand All@@ -532,6 +585,10 @@ export const BranchToolbar = memo(function BranchToolbar({
 onStartFromOriginChange={onStartFromOriginChange}
 {...(onCheckoutPullRequestRequest ? { onCheckoutPullRequestRequest } : {})}
 {...(onComposerFocusRequest ? { onComposerFocusRequest } : {})}
 openRequestId={contextPickerRequest?.picker === "branch" ? contextPickerRequest.id : null}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand Down

45 changes: 38 additions & 7 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ interface BranchToolbarBranchSelectorProps {
 onStartFromOriginChange: (startFromOrigin: boolean) => void;
 onCheckoutPullRequestRequest?: (reference: string) => void;
 onComposerFocusRequest?: () => void;
 openRequestId?: number | null;
 onOpenRequestHandled?: (requestId: number) => void;
}

function toBranchActionErrorMessage(error: unknown): string {
Expand All@@ -98,6 +100,8 @@ export function BranchToolbarBranchSelector({
 onStartFromOriginChange,
 onCheckoutPullRequestRequest,
 onComposerFocusRequest,
 openRequestId,
 onOpenRequestHandled,
}: BranchToolbarBranchSelectorProps) {
 const startFromOriginSwitchId = useId();
 const stopThreadSession = useAtomCommand(threadEnvironment.stopSession, "thread session stop");
Expand DownExpand Up@@ -208,6 +212,8 @@ export function BranchToolbarBranchSelector({
 // Git ref queries
 // ---------------------------------------------------------------------------
 const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 const pendingOpenRequestRef = useRef(false);
 const [branchQuery, setBranchQuery] = useState("");
 const deferredBranchQuery = useDeferredValue(branchQuery);

Expand DownExpand Up@@ -330,6 +336,19 @@ export function BranchToolbarBranchSelector({
 ? queriedActiveBranch.isRemote === true
 : null;
 const [isBranchActionPending, startBranchActionTransition] = useTransition();
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 pendingOpenRequestRef.current = true;
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 useEffect(() => {
 if (pendingOpenRequestRef.current && !isInitialBranchesLoadPending && !isBranchActionPending) {
 pendingOpenRequestRef.current = false;
 setIsBranchMenuOpen(true);
 }
 }, [isBranchActionPending, isInitialBranchesLoadPending]);
 const totalBranchCount = branchRefState.data?.totalCount ?? 0;
 const branchStatusText = isInitialBranchesLoadPending
 ? "Loading refs..."
Expand DownExpand Up@@ -394,6 +413,7 @@ export function BranchToolbarBranchSelector({

 if (isSelectingWorktreeBase) {
 setThreadBranch(refName.name, null);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -407,6 +427,7 @@ export function BranchToolbarBranchSelector({

 if (selectionTarget.reuseExistingWorktree) {
 setThreadBranch(refName.name, selectionTarget.nextWorktreePath);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -416,6 +437,7 @@ export function BranchToolbarBranchSelector({
 ? deriveLocalBranchNameFromRemoteRef(refName.name)
 : refName.name;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -454,6 +476,7 @@ export function BranchToolbarBranchSelector({
 const name = sanitizeNewRefName(rawName);
 if (!branchCwd || !name || isBranchActionPending) return;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -519,13 +542,20 @@ export function BranchToolbarBranchSelector({
 // ---------------------------------------------------------------------------
 const branchListScrollElementRef = useRef<HTMLElement | null>(null);
 const previousBranchListScrollTopRef = useRef<number | null>(null);
 const handleOpenChange = useCallback((open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 }
 }, []);
 const handleOpenChange = useCallback(
 (open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 if (openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onComposerFocusRequest?.();
 }
 }
 },
 [onComposerFocusRequest],
 );

 const [showTopBranchScrollFade, setShowTopBranchScrollFade] = useState(false);
 const [showBottomBranchScrollFade, setShowBottomBranchScrollFade] = useState(false);
Expand DownExpand Up@@ -641,6 +671,7 @@ export function BranchToolbarBranchSelector({
 if (!prReference || !onCheckoutPullRequestRequest) {
 return;
 }
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 setBranchQuery("");
 onComposerFocusRequest?.();
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { FolderGit2Icon, FolderGitIcon, FolderIcon, HistoryIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import {
 resolveCurrentWorkspaceLabel,
Expand All@@ -26,6 +26,9 @@ interface BranchToolbarEnvModeSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel?: string | null;
 onUsePreviousWorktree?: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSelector({
Expand All@@ -35,7 +38,19 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvModeSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const showPreviousWorktree = Boolean(previousWorktreeLabel && onUsePreviousWorktree);
 const envModeItems = useMemo(
 () => [
Expand DownExpand Up@@ -72,6 +87,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={effectiveEnvMode}
 onValueChange={(value: string | null) => {
 if (value === PREVIOUS_WORKTREE_SELECT_VALUE) {
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { EnvironmentId } from "@t3tools/contracts";
import { CloudIcon, MonitorIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import type { EnvironmentOption } from "./BranchToolbar.logic";
import {
Expand All@@ -20,14 +20,29 @@ interface BranchToolbarEnvironmentSelectorProps {
 // Absent when there is only one environment to show: the indicator still
 // renders (as a static label) so remote projects are always identifiable.
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvironmentSelector({
 envLocked,
 environmentId,
 availableEnvironments,
 onEnvironmentChange,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvironmentSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(() => {
 return availableEnvironments.find((env) => env.environmentId === environmentId) ?? null;
 }, [availableEnvironments, environmentId]);
Expand DownExpand Up@@ -75,6 +90,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={environmentId}
 onValueChange={(value) => onEnvironmentChange(value as EnvironmentId)}
 items={environmentItems}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[DO NOT MERGE] feat(web): add context picker slash commands#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

sameerr03
wants to merge
1
commit into

base:personal/v1-efficiency-base
Choose a base branch

from

 Draft


[DO NOT MERGE] feat(web): add context picker slash commands
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 59 additions & 2 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
} from "lucide-react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import type { ComposerContextPicker } from "../composer-logic";
import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
import { useIsMobile } from "../hooks/useMediaQuery";
Expand DownExpand Up@@ -57,6 +58,8 @@ interface BranchToolbarProps {
 onComposerFocusRequest?: () => void;
 availableEnvironments?: readonly EnvironmentOption[];
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 contextPickerRequest?: { readonly picker: ComposerContextPicker; readonly id: number } | null;
 onContextPickerRequestHandled?: (requestId: number) => void;
}

interface MobileRunContextSelectorProps {
Expand All@@ -72,6 +75,9 @@ interface MobileRunContextSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel: string | null;
 onUsePreviousWorktree: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

const MobileRunContextSelector = memo(function MobileRunContextSelector({
Expand All@@ -87,7 +93,19 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: MobileRunContextSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(
 () => availableEnvironments?.find((env) => env.environmentId === environmentId) ?? null,
 [availableEnvironments, environmentId],
Expand All@@ -103,7 +121,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 : effectiveEnvMode === "worktree"
 ? resolveEnvModeLabel("worktree")
 : resolveCurrentWorkspaceLabel(activeWorktreePath);
 const isLocked = envLocked || envModeLocked;
 const isLocked = envLocked && envModeLocked;
 const EnvironmentIcon = activeEnvironment?.isPrimary ? MonitorIcon : CloudIcon;
 const icon = showEnvironmentIndicator ? (
 // Button's base styles apply `-mx-0.5` to descendant SVGs, which eats 4px
Expand DownExpand Up@@ -133,7 +151,16 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 }

 return (
 <Menu>
 <Menu
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 >
 <MenuTrigger
 render={<Button variant="ghost" size="xs" />}
 className="min-w-0 max-w-[48%] flex-1 justify-start text-muted-foreground/70 hover:text-foreground/80 md:hidden"
Expand DownExpand Up@@ -389,6 +416,8 @@ export const BranchToolbar = memo(function BranchToolbar({
 onComposerFocusRequest,
 availableEnvironments,
 onEnvironmentChange,
 contextPickerRequest,
 onContextPickerRequestHandled,
}: BranchToolbarProps) {
 const threadRef = useMemo(
 () => scopeThreadRef(environmentId, threadId),
Expand DownExpand Up@@ -485,6 +514,16 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "environment" ||
 contextPickerRequest?.picker === "worktree"
 ? contextPickerRequest.id
 : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : (
 <div className="flex min-w-0 flex-1 items-center gap-1">
Expand All@@ -495,6 +534,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 environmentId={environmentId}
 availableEnvironments={availableEnvironments}
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 openRequestId={
 contextPickerRequest?.picker === "environment" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 {showGitControls ? (
 <Separator
Expand All@@ -513,6 +559,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "worktree" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand All@@ -532,6 +585,10 @@ export const BranchToolbar = memo(function BranchToolbar({
 onStartFromOriginChange={onStartFromOriginChange}
 {...(onCheckoutPullRequestRequest ? { onCheckoutPullRequestRequest } : {})}
 {...(onComposerFocusRequest ? { onComposerFocusRequest } : {})}
 openRequestId={contextPickerRequest?.picker === "branch" ? contextPickerRequest.id : null}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand Down

45 changes: 38 additions & 7 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ interface BranchToolbarBranchSelectorProps {
 onStartFromOriginChange: (startFromOrigin: boolean) => void;
 onCheckoutPullRequestRequest?: (reference: string) => void;
 onComposerFocusRequest?: () => void;
 openRequestId?: number | null;
 onOpenRequestHandled?: (requestId: number) => void;
}

function toBranchActionErrorMessage(error: unknown): string {
Expand All@@ -98,6 +100,8 @@ export function BranchToolbarBranchSelector({
 onStartFromOriginChange,
 onCheckoutPullRequestRequest,
 onComposerFocusRequest,
 openRequestId,
 onOpenRequestHandled,
}: BranchToolbarBranchSelectorProps) {
 const startFromOriginSwitchId = useId();
 const stopThreadSession = useAtomCommand(threadEnvironment.stopSession, "thread session stop");
Expand DownExpand Up@@ -208,6 +212,8 @@ export function BranchToolbarBranchSelector({
 // Git ref queries
 // ---------------------------------------------------------------------------
 const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 const pendingOpenRequestRef = useRef(false);
 const [branchQuery, setBranchQuery] = useState("");
 const deferredBranchQuery = useDeferredValue(branchQuery);

Expand DownExpand Up@@ -330,6 +336,19 @@ export function BranchToolbarBranchSelector({
 ? queriedActiveBranch.isRemote === true
 : null;
 const [isBranchActionPending, startBranchActionTransition] = useTransition();
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 pendingOpenRequestRef.current = true;
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 useEffect(() => {
 if (pendingOpenRequestRef.current && !isInitialBranchesLoadPending && !isBranchActionPending) {
 pendingOpenRequestRef.current = false;
 setIsBranchMenuOpen(true);
 }
 }, [isBranchActionPending, isInitialBranchesLoadPending]);
 const totalBranchCount = branchRefState.data?.totalCount ?? 0;
 const branchStatusText = isInitialBranchesLoadPending
 ? "Loading refs..."
Expand DownExpand Up@@ -394,6 +413,7 @@ export function BranchToolbarBranchSelector({

 if (isSelectingWorktreeBase) {
 setThreadBranch(refName.name, null);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -407,6 +427,7 @@ export function BranchToolbarBranchSelector({

 if (selectionTarget.reuseExistingWorktree) {
 setThreadBranch(refName.name, selectionTarget.nextWorktreePath);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -416,6 +437,7 @@ export function BranchToolbarBranchSelector({
 ? deriveLocalBranchNameFromRemoteRef(refName.name)
 : refName.name;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -454,6 +476,7 @@ export function BranchToolbarBranchSelector({
 const name = sanitizeNewRefName(rawName);
 if (!branchCwd || !name || isBranchActionPending) return;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -519,13 +542,20 @@ export function BranchToolbarBranchSelector({
 // ---------------------------------------------------------------------------
 const branchListScrollElementRef = useRef<HTMLElement | null>(null);
 const previousBranchListScrollTopRef = useRef<number | null>(null);
 const handleOpenChange = useCallback((open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 }
 }, []);
 const handleOpenChange = useCallback(
 (open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 if (openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onComposerFocusRequest?.();
 }
 }
 },
 [onComposerFocusRequest],
 );

 const [showTopBranchScrollFade, setShowTopBranchScrollFade] = useState(false);
 const [showBottomBranchScrollFade, setShowBottomBranchScrollFade] = useState(false);
Expand DownExpand Up@@ -641,6 +671,7 @@ export function BranchToolbarBranchSelector({
 if (!prReference || !onCheckoutPullRequestRequest) {
 return;
 }
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 setBranchQuery("");
 onComposerFocusRequest?.();
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { FolderGit2Icon, FolderGitIcon, FolderIcon, HistoryIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import {
 resolveCurrentWorkspaceLabel,
Expand All@@ -26,6 +26,9 @@ interface BranchToolbarEnvModeSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel?: string | null;
 onUsePreviousWorktree?: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSelector({
Expand All@@ -35,7 +38,19 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvModeSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const showPreviousWorktree = Boolean(previousWorktreeLabel && onUsePreviousWorktree);
 const envModeItems = useMemo(
 () => [
Expand DownExpand Up@@ -72,6 +87,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={effectiveEnvMode}
 onValueChange={(value: string | null) => {
 if (value === PREVIOUS_WORKTREE_SELECT_VALUE) {
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { EnvironmentId } from "@t3tools/contracts";
import { CloudIcon, MonitorIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import type { EnvironmentOption } from "./BranchToolbar.logic";
import {
Expand All@@ -20,14 +20,29 @@ interface BranchToolbarEnvironmentSelectorProps {
 // Absent when there is only one environment to show: the indicator still
 // renders (as a static label) so remote projects are always identifiable.
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvironmentSelector({
 envLocked,
 environmentId,
 availableEnvironments,
 onEnvironmentChange,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvironmentSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(() => {
 return availableEnvironments.find((env) => env.environmentId === environmentId) ?? null;
 }, [availableEnvironments, environmentId]);
Expand DownExpand Up@@ -75,6 +90,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={environmentId}
 onValueChange={(value) => onEnvironmentChange(value as EnvironmentId)}
 items={environmentItems}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[DO NOT MERGE] feat(web): add context picker slash commands#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

sameerr03
wants to merge
1
commit into

base:personal/v1-efficiency-base
Choose a base branch

from

 Draft


[DO NOT MERGE] feat(web): add context picker slash commands
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 59 additions & 2 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
} from "lucide-react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import type { ComposerContextPicker } from "../composer-logic";
import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
import { useIsMobile } from "../hooks/useMediaQuery";
Expand DownExpand Up@@ -57,6 +58,8 @@ interface BranchToolbarProps {
 onComposerFocusRequest?: () => void;
 availableEnvironments?: readonly EnvironmentOption[];
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 contextPickerRequest?: { readonly picker: ComposerContextPicker; readonly id: number } | null;
 onContextPickerRequestHandled?: (requestId: number) => void;
}

interface MobileRunContextSelectorProps {
Expand All@@ -72,6 +75,9 @@ interface MobileRunContextSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel: string | null;
 onUsePreviousWorktree: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

const MobileRunContextSelector = memo(function MobileRunContextSelector({
Expand All@@ -87,7 +93,19 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: MobileRunContextSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(
 () => availableEnvironments?.find((env) => env.environmentId === environmentId) ?? null,
 [availableEnvironments, environmentId],
Expand All@@ -103,7 +121,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 : effectiveEnvMode === "worktree"
 ? resolveEnvModeLabel("worktree")
 : resolveCurrentWorkspaceLabel(activeWorktreePath);
 const isLocked = envLocked || envModeLocked;
 const isLocked = envLocked && envModeLocked;
 const EnvironmentIcon = activeEnvironment?.isPrimary ? MonitorIcon : CloudIcon;
 const icon = showEnvironmentIndicator ? (
 // Button's base styles apply `-mx-0.5` to descendant SVGs, which eats 4px
Expand DownExpand Up@@ -133,7 +151,16 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 }

 return (
 <Menu>
 <Menu
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 >
 <MenuTrigger
 render={<Button variant="ghost" size="xs" />}
 className="min-w-0 max-w-[48%] flex-1 justify-start text-muted-foreground/70 hover:text-foreground/80 md:hidden"
Expand DownExpand Up@@ -389,6 +416,8 @@ export const BranchToolbar = memo(function BranchToolbar({
 onComposerFocusRequest,
 availableEnvironments,
 onEnvironmentChange,
 contextPickerRequest,
 onContextPickerRequestHandled,
}: BranchToolbarProps) {
 const threadRef = useMemo(
 () => scopeThreadRef(environmentId, threadId),
Expand DownExpand Up@@ -485,6 +514,16 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "environment" ||
 contextPickerRequest?.picker === "worktree"
 ? contextPickerRequest.id
 : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : (
 <div className="flex min-w-0 flex-1 items-center gap-1">
Expand All@@ -495,6 +534,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 environmentId={environmentId}
 availableEnvironments={availableEnvironments}
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 openRequestId={
 contextPickerRequest?.picker === "environment" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 {showGitControls ? (
 <Separator
Expand All@@ -513,6 +559,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "worktree" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand All@@ -532,6 +585,10 @@ export const BranchToolbar = memo(function BranchToolbar({
 onStartFromOriginChange={onStartFromOriginChange}
 {...(onCheckoutPullRequestRequest ? { onCheckoutPullRequestRequest } : {})}
 {...(onComposerFocusRequest ? { onComposerFocusRequest } : {})}
 openRequestId={contextPickerRequest?.picker === "branch" ? contextPickerRequest.id : null}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand Down

45 changes: 38 additions & 7 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ interface BranchToolbarBranchSelectorProps {
 onStartFromOriginChange: (startFromOrigin: boolean) => void;
 onCheckoutPullRequestRequest?: (reference: string) => void;
 onComposerFocusRequest?: () => void;
 openRequestId?: number | null;
 onOpenRequestHandled?: (requestId: number) => void;
}

function toBranchActionErrorMessage(error: unknown): string {
Expand All@@ -98,6 +100,8 @@ export function BranchToolbarBranchSelector({
 onStartFromOriginChange,
 onCheckoutPullRequestRequest,
 onComposerFocusRequest,
 openRequestId,
 onOpenRequestHandled,
}: BranchToolbarBranchSelectorProps) {
 const startFromOriginSwitchId = useId();
 const stopThreadSession = useAtomCommand(threadEnvironment.stopSession, "thread session stop");
Expand DownExpand Up@@ -208,6 +212,8 @@ export function BranchToolbarBranchSelector({
 // Git ref queries
 // ---------------------------------------------------------------------------
 const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 const pendingOpenRequestRef = useRef(false);
 const [branchQuery, setBranchQuery] = useState("");
 const deferredBranchQuery = useDeferredValue(branchQuery);

Expand DownExpand Up@@ -330,6 +336,19 @@ export function BranchToolbarBranchSelector({
 ? queriedActiveBranch.isRemote === true
 : null;
 const [isBranchActionPending, startBranchActionTransition] = useTransition();
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 pendingOpenRequestRef.current = true;
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 useEffect(() => {
 if (pendingOpenRequestRef.current && !isInitialBranchesLoadPending && !isBranchActionPending) {
 pendingOpenRequestRef.current = false;
 setIsBranchMenuOpen(true);
 }
 }, [isBranchActionPending, isInitialBranchesLoadPending]);
 const totalBranchCount = branchRefState.data?.totalCount ?? 0;
 const branchStatusText = isInitialBranchesLoadPending
 ? "Loading refs..."
Expand DownExpand Up@@ -394,6 +413,7 @@ export function BranchToolbarBranchSelector({

 if (isSelectingWorktreeBase) {
 setThreadBranch(refName.name, null);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -407,6 +427,7 @@ export function BranchToolbarBranchSelector({

 if (selectionTarget.reuseExistingWorktree) {
 setThreadBranch(refName.name, selectionTarget.nextWorktreePath);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -416,6 +437,7 @@ export function BranchToolbarBranchSelector({
 ? deriveLocalBranchNameFromRemoteRef(refName.name)
 : refName.name;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -454,6 +476,7 @@ export function BranchToolbarBranchSelector({
 const name = sanitizeNewRefName(rawName);
 if (!branchCwd || !name || isBranchActionPending) return;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -519,13 +542,20 @@ export function BranchToolbarBranchSelector({
 // ---------------------------------------------------------------------------
 const branchListScrollElementRef = useRef<HTMLElement | null>(null);
 const previousBranchListScrollTopRef = useRef<number | null>(null);
 const handleOpenChange = useCallback((open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 }
 }, []);
 const handleOpenChange = useCallback(
 (open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 if (openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onComposerFocusRequest?.();
 }
 }
 },
 [onComposerFocusRequest],
 );

 const [showTopBranchScrollFade, setShowTopBranchScrollFade] = useState(false);
 const [showBottomBranchScrollFade, setShowBottomBranchScrollFade] = useState(false);
Expand DownExpand Up@@ -641,6 +671,7 @@ export function BranchToolbarBranchSelector({
 if (!prReference || !onCheckoutPullRequestRequest) {
 return;
 }
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 setBranchQuery("");
 onComposerFocusRequest?.();
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { FolderGit2Icon, FolderGitIcon, FolderIcon, HistoryIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import {
 resolveCurrentWorkspaceLabel,
Expand All@@ -26,6 +26,9 @@ interface BranchToolbarEnvModeSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel?: string | null;
 onUsePreviousWorktree?: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSelector({
Expand All@@ -35,7 +38,19 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvModeSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const showPreviousWorktree = Boolean(previousWorktreeLabel && onUsePreviousWorktree);
 const envModeItems = useMemo(
 () => [
Expand DownExpand Up@@ -72,6 +87,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={effectiveEnvMode}
 onValueChange={(value: string | null) => {
 if (value === PREVIOUS_WORKTREE_SELECT_VALUE) {
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { EnvironmentId } from "@t3tools/contracts";
import { CloudIcon, MonitorIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import type { EnvironmentOption } from "./BranchToolbar.logic";
import {
Expand All@@ -20,14 +20,29 @@ interface BranchToolbarEnvironmentSelectorProps {
 // Absent when there is only one environment to show: the indicator still
 // renders (as a static label) so remote projects are always identifiable.
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvironmentSelector({
 envLocked,
 environmentId,
 availableEnvironments,
 onEnvironmentChange,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvironmentSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(() => {
 return availableEnvironments.find((env) => env.environmentId === environmentId) ?? null;
 }, [availableEnvironments, environmentId]);
Expand DownExpand Up@@ -75,6 +90,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={environmentId}
 onValueChange={(value) => onEnvironmentChange(value as EnvironmentId)}
 items={environmentItems}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[DO NOT MERGE] feat(web): add context picker slash commands#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

sameerr03
wants to merge
1
commit into

base:personal/v1-efficiency-base
Choose a base branch

from

 Draft


[DO NOT MERGE] feat(web): add context picker slash commands
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 59 additions & 2 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
} from "lucide-react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import type { ComposerContextPicker } from "../composer-logic";
import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
import { useIsMobile } from "../hooks/useMediaQuery";
Expand DownExpand Up@@ -57,6 +58,8 @@ interface BranchToolbarProps {
 onComposerFocusRequest?: () => void;
 availableEnvironments?: readonly EnvironmentOption[];
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 contextPickerRequest?: { readonly picker: ComposerContextPicker; readonly id: number } | null;
 onContextPickerRequestHandled?: (requestId: number) => void;
}

interface MobileRunContextSelectorProps {
Expand All@@ -72,6 +75,9 @@ interface MobileRunContextSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel: string | null;
 onUsePreviousWorktree: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

const MobileRunContextSelector = memo(function MobileRunContextSelector({
Expand All@@ -87,7 +93,19 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: MobileRunContextSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(
 () => availableEnvironments?.find((env) => env.environmentId === environmentId) ?? null,
 [availableEnvironments, environmentId],
Expand All@@ -103,7 +121,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 : effectiveEnvMode === "worktree"
 ? resolveEnvModeLabel("worktree")
 : resolveCurrentWorkspaceLabel(activeWorktreePath);
 const isLocked = envLocked || envModeLocked;
 const isLocked = envLocked && envModeLocked;
 const EnvironmentIcon = activeEnvironment?.isPrimary ? MonitorIcon : CloudIcon;
 const icon = showEnvironmentIndicator ? (
 // Button's base styles apply `-mx-0.5` to descendant SVGs, which eats 4px
Expand DownExpand Up@@ -133,7 +151,16 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 }

 return (
 <Menu>
 <Menu
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 >
 <MenuTrigger
 render={<Button variant="ghost" size="xs" />}
 className="min-w-0 max-w-[48%] flex-1 justify-start text-muted-foreground/70 hover:text-foreground/80 md:hidden"
Expand DownExpand Up@@ -389,6 +416,8 @@ export const BranchToolbar = memo(function BranchToolbar({
 onComposerFocusRequest,
 availableEnvironments,
 onEnvironmentChange,
 contextPickerRequest,
 onContextPickerRequestHandled,
}: BranchToolbarProps) {
 const threadRef = useMemo(
 () => scopeThreadRef(environmentId, threadId),
Expand DownExpand Up@@ -485,6 +514,16 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "environment" ||
 contextPickerRequest?.picker === "worktree"
 ? contextPickerRequest.id
 : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : (
 <div className="flex min-w-0 flex-1 items-center gap-1">
Expand All@@ -495,6 +534,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 environmentId={environmentId}
 availableEnvironments={availableEnvironments}
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 openRequestId={
 contextPickerRequest?.picker === "environment" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 {showGitControls ? (
 <Separator
Expand All@@ -513,6 +559,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "worktree" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand All@@ -532,6 +585,10 @@ export const BranchToolbar = memo(function BranchToolbar({
 onStartFromOriginChange={onStartFromOriginChange}
 {...(onCheckoutPullRequestRequest ? { onCheckoutPullRequestRequest } : {})}
 {...(onComposerFocusRequest ? { onComposerFocusRequest } : {})}
 openRequestId={contextPickerRequest?.picker === "branch" ? contextPickerRequest.id : null}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand Down

45 changes: 38 additions & 7 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ interface BranchToolbarBranchSelectorProps {
 onStartFromOriginChange: (startFromOrigin: boolean) => void;
 onCheckoutPullRequestRequest?: (reference: string) => void;
 onComposerFocusRequest?: () => void;
 openRequestId?: number | null;
 onOpenRequestHandled?: (requestId: number) => void;
}

function toBranchActionErrorMessage(error: unknown): string {
Expand All@@ -98,6 +100,8 @@ export function BranchToolbarBranchSelector({
 onStartFromOriginChange,
 onCheckoutPullRequestRequest,
 onComposerFocusRequest,
 openRequestId,
 onOpenRequestHandled,
}: BranchToolbarBranchSelectorProps) {
 const startFromOriginSwitchId = useId();
 const stopThreadSession = useAtomCommand(threadEnvironment.stopSession, "thread session stop");
Expand DownExpand Up@@ -208,6 +212,8 @@ export function BranchToolbarBranchSelector({
 // Git ref queries
 // ---------------------------------------------------------------------------
 const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 const pendingOpenRequestRef = useRef(false);
 const [branchQuery, setBranchQuery] = useState("");
 const deferredBranchQuery = useDeferredValue(branchQuery);

Expand DownExpand Up@@ -330,6 +336,19 @@ export function BranchToolbarBranchSelector({
 ? queriedActiveBranch.isRemote === true
 : null;
 const [isBranchActionPending, startBranchActionTransition] = useTransition();
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 pendingOpenRequestRef.current = true;
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 useEffect(() => {
 if (pendingOpenRequestRef.current && !isInitialBranchesLoadPending && !isBranchActionPending) {
 pendingOpenRequestRef.current = false;
 setIsBranchMenuOpen(true);
 }
 }, [isBranchActionPending, isInitialBranchesLoadPending]);
 const totalBranchCount = branchRefState.data?.totalCount ?? 0;
 const branchStatusText = isInitialBranchesLoadPending
 ? "Loading refs..."
Expand DownExpand Up@@ -394,6 +413,7 @@ export function BranchToolbarBranchSelector({

 if (isSelectingWorktreeBase) {
 setThreadBranch(refName.name, null);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -407,6 +427,7 @@ export function BranchToolbarBranchSelector({

 if (selectionTarget.reuseExistingWorktree) {
 setThreadBranch(refName.name, selectionTarget.nextWorktreePath);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -416,6 +437,7 @@ export function BranchToolbarBranchSelector({
 ? deriveLocalBranchNameFromRemoteRef(refName.name)
 : refName.name;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -454,6 +476,7 @@ export function BranchToolbarBranchSelector({
 const name = sanitizeNewRefName(rawName);
 if (!branchCwd || !name || isBranchActionPending) return;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -519,13 +542,20 @@ export function BranchToolbarBranchSelector({
 // ---------------------------------------------------------------------------
 const branchListScrollElementRef = useRef<HTMLElement | null>(null);
 const previousBranchListScrollTopRef = useRef<number | null>(null);
 const handleOpenChange = useCallback((open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 }
 }, []);
 const handleOpenChange = useCallback(
 (open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 if (openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onComposerFocusRequest?.();
 }
 }
 },
 [onComposerFocusRequest],
 );

 const [showTopBranchScrollFade, setShowTopBranchScrollFade] = useState(false);
 const [showBottomBranchScrollFade, setShowBottomBranchScrollFade] = useState(false);
Expand DownExpand Up@@ -641,6 +671,7 @@ export function BranchToolbarBranchSelector({
 if (!prReference || !onCheckoutPullRequestRequest) {
 return;
 }
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 setBranchQuery("");
 onComposerFocusRequest?.();
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { FolderGit2Icon, FolderGitIcon, FolderIcon, HistoryIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import {
 resolveCurrentWorkspaceLabel,
Expand All@@ -26,6 +26,9 @@ interface BranchToolbarEnvModeSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel?: string | null;
 onUsePreviousWorktree?: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSelector({
Expand All@@ -35,7 +38,19 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvModeSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const showPreviousWorktree = Boolean(previousWorktreeLabel && onUsePreviousWorktree);
 const envModeItems = useMemo(
 () => [
Expand DownExpand Up@@ -72,6 +87,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={effectiveEnvMode}
 onValueChange={(value: string | null) => {
 if (value === PREVIOUS_WORKTREE_SELECT_VALUE) {
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { EnvironmentId } from "@t3tools/contracts";
import { CloudIcon, MonitorIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import type { EnvironmentOption } from "./BranchToolbar.logic";
import {
Expand All@@ -20,14 +20,29 @@ interface BranchToolbarEnvironmentSelectorProps {
 // Absent when there is only one environment to show: the indicator still
 // renders (as a static label) so remote projects are always identifiable.
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvironmentSelector({
 envLocked,
 environmentId,
 availableEnvironments,
 onEnvironmentChange,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvironmentSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(() => {
 return availableEnvironments.find((env) => env.environmentId === environmentId) ?? null;
 }, [availableEnvironments, environmentId]);
Expand DownExpand Up@@ -75,6 +90,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={environmentId}
 onValueChange={(value) => onEnvironmentChange(value as EnvironmentId)}
 items={environmentItems}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[DO NOT MERGE] feat(web): add context picker slash commands#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

sameerr03
wants to merge
1
commit into

base:personal/v1-efficiency-base
Choose a base branch

from

 Draft


[DO NOT MERGE] feat(web): add context picker slash commands
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 59 additions & 2 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
} from "lucide-react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import type { ComposerContextPicker } from "../composer-logic";
import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
import { useIsMobile } from "../hooks/useMediaQuery";
Expand DownExpand Up@@ -57,6 +58,8 @@ interface BranchToolbarProps {
 onComposerFocusRequest?: () => void;
 availableEnvironments?: readonly EnvironmentOption[];
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 contextPickerRequest?: { readonly picker: ComposerContextPicker; readonly id: number } | null;
 onContextPickerRequestHandled?: (requestId: number) => void;
}

interface MobileRunContextSelectorProps {
Expand All@@ -72,6 +75,9 @@ interface MobileRunContextSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel: string | null;
 onUsePreviousWorktree: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

const MobileRunContextSelector = memo(function MobileRunContextSelector({
Expand All@@ -87,7 +93,19 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: MobileRunContextSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(
 () => availableEnvironments?.find((env) => env.environmentId === environmentId) ?? null,
 [availableEnvironments, environmentId],
Expand All@@ -103,7 +121,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 : effectiveEnvMode === "worktree"
 ? resolveEnvModeLabel("worktree")
 : resolveCurrentWorkspaceLabel(activeWorktreePath);
 const isLocked = envLocked || envModeLocked;
 const isLocked = envLocked && envModeLocked;
 const EnvironmentIcon = activeEnvironment?.isPrimary ? MonitorIcon : CloudIcon;
 const icon = showEnvironmentIndicator ? (
 // Button's base styles apply `-mx-0.5` to descendant SVGs, which eats 4px
Expand DownExpand Up@@ -133,7 +151,16 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 }

 return (
 <Menu>
 <Menu
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 >
 <MenuTrigger
 render={<Button variant="ghost" size="xs" />}
 className="min-w-0 max-w-[48%] flex-1 justify-start text-muted-foreground/70 hover:text-foreground/80 md:hidden"
Expand DownExpand Up@@ -389,6 +416,8 @@ export const BranchToolbar = memo(function BranchToolbar({
 onComposerFocusRequest,
 availableEnvironments,
 onEnvironmentChange,
 contextPickerRequest,
 onContextPickerRequestHandled,
}: BranchToolbarProps) {
 const threadRef = useMemo(
 () => scopeThreadRef(environmentId, threadId),
Expand DownExpand Up@@ -485,6 +514,16 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "environment" ||
 contextPickerRequest?.picker === "worktree"
 ? contextPickerRequest.id
 : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : (
 <div className="flex min-w-0 flex-1 items-center gap-1">
Expand All@@ -495,6 +534,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 environmentId={environmentId}
 availableEnvironments={availableEnvironments}
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 openRequestId={
 contextPickerRequest?.picker === "environment" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 {showGitControls ? (
 <Separator
Expand All@@ -513,6 +559,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "worktree" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand All@@ -532,6 +585,10 @@ export const BranchToolbar = memo(function BranchToolbar({
 onStartFromOriginChange={onStartFromOriginChange}
 {...(onCheckoutPullRequestRequest ? { onCheckoutPullRequestRequest } : {})}
 {...(onComposerFocusRequest ? { onComposerFocusRequest } : {})}
 openRequestId={contextPickerRequest?.picker === "branch" ? contextPickerRequest.id : null}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand Down

45 changes: 38 additions & 7 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ interface BranchToolbarBranchSelectorProps {
 onStartFromOriginChange: (startFromOrigin: boolean) => void;
 onCheckoutPullRequestRequest?: (reference: string) => void;
 onComposerFocusRequest?: () => void;
 openRequestId?: number | null;
 onOpenRequestHandled?: (requestId: number) => void;
}

function toBranchActionErrorMessage(error: unknown): string {
Expand All@@ -98,6 +100,8 @@ export function BranchToolbarBranchSelector({
 onStartFromOriginChange,
 onCheckoutPullRequestRequest,
 onComposerFocusRequest,
 openRequestId,
 onOpenRequestHandled,
}: BranchToolbarBranchSelectorProps) {
 const startFromOriginSwitchId = useId();
 const stopThreadSession = useAtomCommand(threadEnvironment.stopSession, "thread session stop");
Expand DownExpand Up@@ -208,6 +212,8 @@ export function BranchToolbarBranchSelector({
 // Git ref queries
 // ---------------------------------------------------------------------------
 const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 const pendingOpenRequestRef = useRef(false);
 const [branchQuery, setBranchQuery] = useState("");
 const deferredBranchQuery = useDeferredValue(branchQuery);

Expand DownExpand Up@@ -330,6 +336,19 @@ export function BranchToolbarBranchSelector({
 ? queriedActiveBranch.isRemote === true
 : null;
 const [isBranchActionPending, startBranchActionTransition] = useTransition();
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 pendingOpenRequestRef.current = true;
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 useEffect(() => {
 if (pendingOpenRequestRef.current && !isInitialBranchesLoadPending && !isBranchActionPending) {
 pendingOpenRequestRef.current = false;
 setIsBranchMenuOpen(true);
 }
 }, [isBranchActionPending, isInitialBranchesLoadPending]);
 const totalBranchCount = branchRefState.data?.totalCount ?? 0;
 const branchStatusText = isInitialBranchesLoadPending
 ? "Loading refs..."
Expand DownExpand Up@@ -394,6 +413,7 @@ export function BranchToolbarBranchSelector({

 if (isSelectingWorktreeBase) {
 setThreadBranch(refName.name, null);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -407,6 +427,7 @@ export function BranchToolbarBranchSelector({

 if (selectionTarget.reuseExistingWorktree) {
 setThreadBranch(refName.name, selectionTarget.nextWorktreePath);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -416,6 +437,7 @@ export function BranchToolbarBranchSelector({
 ? deriveLocalBranchNameFromRemoteRef(refName.name)
 : refName.name;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -454,6 +476,7 @@ export function BranchToolbarBranchSelector({
 const name = sanitizeNewRefName(rawName);
 if (!branchCwd || !name || isBranchActionPending) return;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -519,13 +542,20 @@ export function BranchToolbarBranchSelector({
 // ---------------------------------------------------------------------------
 const branchListScrollElementRef = useRef<HTMLElement | null>(null);
 const previousBranchListScrollTopRef = useRef<number | null>(null);
 const handleOpenChange = useCallback((open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 }
 }, []);
 const handleOpenChange = useCallback(
 (open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 if (openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onComposerFocusRequest?.();
 }
 }
 },
 [onComposerFocusRequest],
 );

 const [showTopBranchScrollFade, setShowTopBranchScrollFade] = useState(false);
 const [showBottomBranchScrollFade, setShowBottomBranchScrollFade] = useState(false);
Expand DownExpand Up@@ -641,6 +671,7 @@ export function BranchToolbarBranchSelector({
 if (!prReference || !onCheckoutPullRequestRequest) {
 return;
 }
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 setBranchQuery("");
 onComposerFocusRequest?.();
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { FolderGit2Icon, FolderGitIcon, FolderIcon, HistoryIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import {
 resolveCurrentWorkspaceLabel,
Expand All@@ -26,6 +26,9 @@ interface BranchToolbarEnvModeSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel?: string | null;
 onUsePreviousWorktree?: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSelector({
Expand All@@ -35,7 +38,19 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvModeSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const showPreviousWorktree = Boolean(previousWorktreeLabel && onUsePreviousWorktree);
 const envModeItems = useMemo(
 () => [
Expand DownExpand Up@@ -72,6 +87,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={effectiveEnvMode}
 onValueChange={(value: string | null) => {
 if (value === PREVIOUS_WORKTREE_SELECT_VALUE) {
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { EnvironmentId } from "@t3tools/contracts";
import { CloudIcon, MonitorIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import type { EnvironmentOption } from "./BranchToolbar.logic";
import {
Expand All@@ -20,14 +20,29 @@ interface BranchToolbarEnvironmentSelectorProps {
 // Absent when there is only one environment to show: the indicator still
 // renders (as a static label) so remote projects are always identifiable.
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvironmentSelector({
 envLocked,
 environmentId,
 availableEnvironments,
 onEnvironmentChange,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvironmentSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(() => {
 return availableEnvironments.find((env) => env.environmentId === environmentId) ?? null;
 }, [availableEnvironments, environmentId]);
Expand DownExpand Up@@ -75,6 +90,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={environmentId}
 onValueChange={(value) => onEnvironmentChange(value as EnvironmentId)}
 items={environmentItems}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[DO NOT MERGE] feat(web): add context picker slash commands#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

sameerr03
wants to merge
1
commit into

base:personal/v1-efficiency-base
Choose a base branch

from

 Draft


[DO NOT MERGE] feat(web): add context picker slash commands
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 59 additions & 2 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
} from "lucide-react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import type { ComposerContextPicker } from "../composer-logic";
import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
import { useIsMobile } from "../hooks/useMediaQuery";
Expand DownExpand Up@@ -57,6 +58,8 @@ interface BranchToolbarProps {
 onComposerFocusRequest?: () => void;
 availableEnvironments?: readonly EnvironmentOption[];
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 contextPickerRequest?: { readonly picker: ComposerContextPicker; readonly id: number } | null;
 onContextPickerRequestHandled?: (requestId: number) => void;
}

interface MobileRunContextSelectorProps {
Expand All@@ -72,6 +75,9 @@ interface MobileRunContextSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel: string | null;
 onUsePreviousWorktree: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

const MobileRunContextSelector = memo(function MobileRunContextSelector({
Expand All@@ -87,7 +93,19 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: MobileRunContextSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(
 () => availableEnvironments?.find((env) => env.environmentId === environmentId) ?? null,
 [availableEnvironments, environmentId],
Expand All@@ -103,7 +121,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 : effectiveEnvMode === "worktree"
 ? resolveEnvModeLabel("worktree")
 : resolveCurrentWorkspaceLabel(activeWorktreePath);
 const isLocked = envLocked || envModeLocked;
 const isLocked = envLocked && envModeLocked;
 const EnvironmentIcon = activeEnvironment?.isPrimary ? MonitorIcon : CloudIcon;
 const icon = showEnvironmentIndicator ? (
 // Button's base styles apply `-mx-0.5` to descendant SVGs, which eats 4px
Expand DownExpand Up@@ -133,7 +151,16 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 }

 return (
 <Menu>
 <Menu
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 >
 <MenuTrigger
 render={<Button variant="ghost" size="xs" />}
 className="min-w-0 max-w-[48%] flex-1 justify-start text-muted-foreground/70 hover:text-foreground/80 md:hidden"
Expand DownExpand Up@@ -389,6 +416,8 @@ export const BranchToolbar = memo(function BranchToolbar({
 onComposerFocusRequest,
 availableEnvironments,
 onEnvironmentChange,
 contextPickerRequest,
 onContextPickerRequestHandled,
}: BranchToolbarProps) {
 const threadRef = useMemo(
 () => scopeThreadRef(environmentId, threadId),
Expand DownExpand Up@@ -485,6 +514,16 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "environment" ||
 contextPickerRequest?.picker === "worktree"
 ? contextPickerRequest.id
 : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : (
 <div className="flex min-w-0 flex-1 items-center gap-1">
Expand All@@ -495,6 +534,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 environmentId={environmentId}
 availableEnvironments={availableEnvironments}
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 openRequestId={
 contextPickerRequest?.picker === "environment" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 {showGitControls ? (
 <Separator
Expand All@@ -513,6 +559,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "worktree" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand All@@ -532,6 +585,10 @@ export const BranchToolbar = memo(function BranchToolbar({
 onStartFromOriginChange={onStartFromOriginChange}
 {...(onCheckoutPullRequestRequest ? { onCheckoutPullRequestRequest } : {})}
 {...(onComposerFocusRequest ? { onComposerFocusRequest } : {})}
 openRequestId={contextPickerRequest?.picker === "branch" ? contextPickerRequest.id : null}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand Down

45 changes: 38 additions & 7 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ interface BranchToolbarBranchSelectorProps {
 onStartFromOriginChange: (startFromOrigin: boolean) => void;
 onCheckoutPullRequestRequest?: (reference: string) => void;
 onComposerFocusRequest?: () => void;
 openRequestId?: number | null;
 onOpenRequestHandled?: (requestId: number) => void;
}

function toBranchActionErrorMessage(error: unknown): string {
Expand All@@ -98,6 +100,8 @@ export function BranchToolbarBranchSelector({
 onStartFromOriginChange,
 onCheckoutPullRequestRequest,
 onComposerFocusRequest,
 openRequestId,
 onOpenRequestHandled,
}: BranchToolbarBranchSelectorProps) {
 const startFromOriginSwitchId = useId();
 const stopThreadSession = useAtomCommand(threadEnvironment.stopSession, "thread session stop");
Expand DownExpand Up@@ -208,6 +212,8 @@ export function BranchToolbarBranchSelector({
 // Git ref queries
 // ---------------------------------------------------------------------------
 const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 const pendingOpenRequestRef = useRef(false);
 const [branchQuery, setBranchQuery] = useState("");
 const deferredBranchQuery = useDeferredValue(branchQuery);

Expand DownExpand Up@@ -330,6 +336,19 @@ export function BranchToolbarBranchSelector({
 ? queriedActiveBranch.isRemote === true
 : null;
 const [isBranchActionPending, startBranchActionTransition] = useTransition();
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 pendingOpenRequestRef.current = true;
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 useEffect(() => {
 if (pendingOpenRequestRef.current && !isInitialBranchesLoadPending && !isBranchActionPending) {
 pendingOpenRequestRef.current = false;
 setIsBranchMenuOpen(true);
 }
 }, [isBranchActionPending, isInitialBranchesLoadPending]);
 const totalBranchCount = branchRefState.data?.totalCount ?? 0;
 const branchStatusText = isInitialBranchesLoadPending
 ? "Loading refs..."
Expand DownExpand Up@@ -394,6 +413,7 @@ export function BranchToolbarBranchSelector({

 if (isSelectingWorktreeBase) {
 setThreadBranch(refName.name, null);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -407,6 +427,7 @@ export function BranchToolbarBranchSelector({

 if (selectionTarget.reuseExistingWorktree) {
 setThreadBranch(refName.name, selectionTarget.nextWorktreePath);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -416,6 +437,7 @@ export function BranchToolbarBranchSelector({
 ? deriveLocalBranchNameFromRemoteRef(refName.name)
 : refName.name;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -454,6 +476,7 @@ export function BranchToolbarBranchSelector({
 const name = sanitizeNewRefName(rawName);
 if (!branchCwd || !name || isBranchActionPending) return;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -519,13 +542,20 @@ export function BranchToolbarBranchSelector({
 // ---------------------------------------------------------------------------
 const branchListScrollElementRef = useRef<HTMLElement | null>(null);
 const previousBranchListScrollTopRef = useRef<number | null>(null);
 const handleOpenChange = useCallback((open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 }
 }, []);
 const handleOpenChange = useCallback(
 (open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 if (openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onComposerFocusRequest?.();
 }
 }
 },
 [onComposerFocusRequest],
 );

 const [showTopBranchScrollFade, setShowTopBranchScrollFade] = useState(false);
 const [showBottomBranchScrollFade, setShowBottomBranchScrollFade] = useState(false);
Expand DownExpand Up@@ -641,6 +671,7 @@ export function BranchToolbarBranchSelector({
 if (!prReference || !onCheckoutPullRequestRequest) {
 return;
 }
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 setBranchQuery("");
 onComposerFocusRequest?.();
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { FolderGit2Icon, FolderGitIcon, FolderIcon, HistoryIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import {
 resolveCurrentWorkspaceLabel,
Expand All@@ -26,6 +26,9 @@ interface BranchToolbarEnvModeSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel?: string | null;
 onUsePreviousWorktree?: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSelector({
Expand All@@ -35,7 +38,19 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvModeSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const showPreviousWorktree = Boolean(previousWorktreeLabel && onUsePreviousWorktree);
 const envModeItems = useMemo(
 () => [
Expand DownExpand Up@@ -72,6 +87,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={effectiveEnvMode}
 onValueChange={(value: string | null) => {
 if (value === PREVIOUS_WORKTREE_SELECT_VALUE) {
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { EnvironmentId } from "@t3tools/contracts";
import { CloudIcon, MonitorIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import type { EnvironmentOption } from "./BranchToolbar.logic";
import {
Expand All@@ -20,14 +20,29 @@ interface BranchToolbarEnvironmentSelectorProps {
 // Absent when there is only one environment to show: the indicator still
 // renders (as a static label) so remote projects are always identifiable.
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvironmentSelector({
 envLocked,
 environmentId,
 availableEnvironments,
 onEnvironmentChange,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvironmentSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(() => {
 return availableEnvironments.find((env) => env.environmentId === environmentId) ?? null;
 }, [availableEnvironments, environmentId]);
Expand DownExpand Up@@ -75,6 +90,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={environmentId}
 onValueChange={(value) => onEnvironmentChange(value as EnvironmentId)}
 items={environmentItems}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[DO NOT MERGE] feat(web): add context picker slash commands#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

sameerr03
wants to merge
1
commit into

base:personal/v1-efficiency-base
Choose a base branch

from

 Draft


[DO NOT MERGE] feat(web): add context picker slash commands
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 59 additions & 2 deletions
apps/web/src/components/BranchToolbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
} from "lucide-react";
import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";

import type { ComposerContextPicker } from "../composer-logic";
import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
import { useIsMobile } from "../hooks/useMediaQuery";
Expand DownExpand Up@@ -57,6 +58,8 @@ interface BranchToolbarProps {
 onComposerFocusRequest?: () => void;
 availableEnvironments?: readonly EnvironmentOption[];
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 contextPickerRequest?: { readonly picker: ComposerContextPicker; readonly id: number } | null;
 onContextPickerRequestHandled?: (requestId: number) => void;
}

interface MobileRunContextSelectorProps {
Expand All@@ -72,6 +75,9 @@ interface MobileRunContextSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel: string | null;
 onUsePreviousWorktree: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

const MobileRunContextSelector = memo(function MobileRunContextSelector({
Expand All@@ -87,7 +93,19 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: MobileRunContextSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(
 () => availableEnvironments?.find((env) => env.environmentId === environmentId) ?? null,
 [availableEnvironments, environmentId],
Expand All@@ -103,7 +121,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 : effectiveEnvMode === "worktree"
 ? resolveEnvModeLabel("worktree")
 : resolveCurrentWorkspaceLabel(activeWorktreePath);
 const isLocked = envLocked || envModeLocked;
 const isLocked = envLocked && envModeLocked;
 const EnvironmentIcon = activeEnvironment?.isPrimary ? MonitorIcon : CloudIcon;
 const icon = showEnvironmentIndicator ? (
 // Button's base styles apply `-mx-0.5` to descendant SVGs, which eats 4px
Expand DownExpand Up@@ -133,7 +151,16 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
 }

 return (
 <Menu>
 <Menu
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 >
 <MenuTrigger
 render={<Button variant="ghost" size="xs" />}
 className="min-w-0 max-w-[48%] flex-1 justify-start text-muted-foreground/70 hover:text-foreground/80 md:hidden"
Expand DownExpand Up@@ -389,6 +416,8 @@ export const BranchToolbar = memo(function BranchToolbar({
 onComposerFocusRequest,
 availableEnvironments,
 onEnvironmentChange,
 contextPickerRequest,
 onContextPickerRequestHandled,
}: BranchToolbarProps) {
 const threadRef = useMemo(
 () => scopeThreadRef(environmentId, threadId),
Expand DownExpand Up@@ -485,6 +514,16 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "environment" ||
 contextPickerRequest?.picker === "worktree"
 ? contextPickerRequest.id
 : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : (
 <div className="flex min-w-0 flex-1 items-center gap-1">
Expand All@@ -495,6 +534,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 environmentId={environmentId}
 availableEnvironments={availableEnvironments}
 {...(showEnvironmentPicker && onEnvironmentChange ? { onEnvironmentChange } : {})}
 openRequestId={
 contextPickerRequest?.picker === "environment" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 {showGitControls ? (
 <Separator
Expand All@@ -513,6 +559,13 @@ export const BranchToolbar = memo(function BranchToolbar({
 onEnvModeChange={onEnvModeChange}
 previousWorktreeLabel={previousWorktreeLabel}
 onUsePreviousWorktree={onUsePreviousWorktree}
 openRequestId={
 contextPickerRequest?.picker === "worktree" ? contextPickerRequest.id : null
 }
 {...(onComposerFocusRequest ? { onPickerClose: onComposerFocusRequest } : {})}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand All@@ -532,6 +585,10 @@ export const BranchToolbar = memo(function BranchToolbar({
 onStartFromOriginChange={onStartFromOriginChange}
 {...(onCheckoutPullRequestRequest ? { onCheckoutPullRequestRequest } : {})}
 {...(onComposerFocusRequest ? { onComposerFocusRequest } : {})}
 openRequestId={contextPickerRequest?.picker === "branch" ? contextPickerRequest.id : null}
 {...(onContextPickerRequestHandled
 ? { onOpenRequestHandled: onContextPickerRequestHandled }
 : {})}
 />
 ) : null}
 </div>
Expand Down

45 changes: 38 additions & 7 deletions
apps/web/src/components/BranchToolbarBranchSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,8 @@ interface BranchToolbarBranchSelectorProps {
 onStartFromOriginChange: (startFromOrigin: boolean) => void;
 onCheckoutPullRequestRequest?: (reference: string) => void;
 onComposerFocusRequest?: () => void;
 openRequestId?: number | null;
 onOpenRequestHandled?: (requestId: number) => void;
}

function toBranchActionErrorMessage(error: unknown): string {
Expand All@@ -98,6 +100,8 @@ export function BranchToolbarBranchSelector({
 onStartFromOriginChange,
 onCheckoutPullRequestRequest,
 onComposerFocusRequest,
 openRequestId,
 onOpenRequestHandled,
}: BranchToolbarBranchSelectorProps) {
 const startFromOriginSwitchId = useId();
 const stopThreadSession = useAtomCommand(threadEnvironment.stopSession, "thread session stop");
Expand DownExpand Up@@ -208,6 +212,8 @@ export function BranchToolbarBranchSelector({
 // Git ref queries
 // ---------------------------------------------------------------------------
 const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 const pendingOpenRequestRef = useRef(false);
 const [branchQuery, setBranchQuery] = useState("");
 const deferredBranchQuery = useDeferredValue(branchQuery);

Expand DownExpand Up@@ -330,6 +336,19 @@ export function BranchToolbarBranchSelector({
 ? queriedActiveBranch.isRemote === true
 : null;
 const [isBranchActionPending, startBranchActionTransition] = useTransition();
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 pendingOpenRequestRef.current = true;
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 useEffect(() => {
 if (pendingOpenRequestRef.current && !isInitialBranchesLoadPending && !isBranchActionPending) {
 pendingOpenRequestRef.current = false;
 setIsBranchMenuOpen(true);
 }
 }, [isBranchActionPending, isInitialBranchesLoadPending]);
 const totalBranchCount = branchRefState.data?.totalCount ?? 0;
 const branchStatusText = isInitialBranchesLoadPending
 ? "Loading refs..."
Expand DownExpand Up@@ -394,6 +413,7 @@ export function BranchToolbarBranchSelector({

 if (isSelectingWorktreeBase) {
 setThreadBranch(refName.name, null);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -407,6 +427,7 @@ export function BranchToolbarBranchSelector({

 if (selectionTarget.reuseExistingWorktree) {
 setThreadBranch(refName.name, selectionTarget.nextWorktreePath);
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();
 return;
Expand All@@ -416,6 +437,7 @@ export function BranchToolbarBranchSelector({
 ? deriveLocalBranchNameFromRemoteRef(refName.name)
 : refName.name;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -454,6 +476,7 @@ export function BranchToolbarBranchSelector({
 const name = sanitizeNewRefName(rawName);
 if (!branchCwd || !name || isBranchActionPending) return;

 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 onComposerFocusRequest?.();

Expand DownExpand Up@@ -519,13 +542,20 @@ export function BranchToolbarBranchSelector({
 // ---------------------------------------------------------------------------
 const branchListScrollElementRef = useRef<HTMLElement | null>(null);
 const previousBranchListScrollTopRef = useRef<number | null>(null);
 const handleOpenChange = useCallback((open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 }
 }, []);
 const handleOpenChange = useCallback(
 (open: boolean) => {
 previousBranchListScrollTopRef.current = null;
 setIsBranchMenuOpen(open);
 if (!open) {
 setBranchQuery("");
 if (openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onComposerFocusRequest?.();
 }
 }
 },
 [onComposerFocusRequest],
 );

 const [showTopBranchScrollFade, setShowTopBranchScrollFade] = useState(false);
 const [showBottomBranchScrollFade, setShowBottomBranchScrollFade] = useState(false);
Expand DownExpand Up@@ -641,6 +671,7 @@ export function BranchToolbarBranchSelector({
 if (!prReference || !onCheckoutPullRequestRequest) {
 return;
 }
 openedFromRequestRef.current = false;
 setIsBranchMenuOpen(false);
 setBranchQuery("");
 onComposerFocusRequest?.();
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvModeSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { FolderGit2Icon, FolderGitIcon, FolderIcon, HistoryIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import {
 resolveCurrentWorkspaceLabel,
Expand All@@ -26,6 +26,9 @@ interface BranchToolbarEnvModeSelectorProps {
 onEnvModeChange: (mode: EnvMode) => void;
 previousWorktreeLabel?: string | null;
 onUsePreviousWorktree?: () => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSelector({
Expand All@@ -35,7 +38,19 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 onEnvModeChange,
 previousWorktreeLabel,
 onUsePreviousWorktree,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvModeSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const showPreviousWorktree = Boolean(previousWorktreeLabel && onUsePreviousWorktree);
 const envModeItems = useMemo(
 () => [
Expand DownExpand Up@@ -72,6 +87,14 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={effectiveEnvMode}
 onValueChange={(value: string | null) => {
 if (value === PREVIOUS_WORKTREE_SELECT_VALUE) {
Expand Down

25 changes: 24 additions & 1 deletion
apps/web/src/components/BranchToolbarEnvironmentSelector.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { EnvironmentId } from "@t3tools/contracts";
import { CloudIcon, MonitorIcon } from "lucide-react";
import { memo, useMemo } from "react";
import { memo, useEffect, useMemo, useRef, useState } from "react";

import type { EnvironmentOption } from "./BranchToolbar.logic";
import {
Expand All@@ -20,14 +20,29 @@ interface BranchToolbarEnvironmentSelectorProps {
 // Absent when there is only one environment to show: the indicator still
 // renders (as a static label) so remote projects are always identifiable.
 onEnvironmentChange?: (environmentId: EnvironmentId) => void;
 openRequestId?: number | null;
 onPickerClose?: () => void;
 onOpenRequestHandled?: (requestId: number) => void;
}

export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvironmentSelector({
 envLocked,
 environmentId,
 availableEnvironments,
 onEnvironmentChange,
 openRequestId,
 onPickerClose,
 onOpenRequestHandled,
}: BranchToolbarEnvironmentSelectorProps) {
 const [open, setOpen] = useState(false);
 const openedFromRequestRef = useRef(false);
 useEffect(() => {
 if (openRequestId !== null && openRequestId !== undefined) {
 openedFromRequestRef.current = true;
 setOpen(true);
 onOpenRequestHandled?.(openRequestId);
 }
 }, [onOpenRequestHandled, openRequestId]);
 const activeEnvironment = useMemo(() => {
 return availableEnvironments.find((env) => env.environmentId === environmentId) ?? null;
 }, [availableEnvironments, environmentId]);
Expand DownExpand Up@@ -75,6 +90,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
 return (
 <Select
 modal={false}
 open={open}
 onOpenChange={(nextOpen) => {
 setOpen(nextOpen);
 if (!nextOpen && openedFromRequestRef.current) {
 openedFromRequestRef.current = false;
 onPickerClose?.();
 }
 }}
 value={environmentId}
 onValueChange={(value) => onEnvironmentChange(value as EnvironmentId)}
 items={environmentItems}
Expand Down
Loading
Loading