fix: add new session from GitHub PR in SessionSidebar is now back

This commit is contained in:
Bohdan Triapitsyn
2026-02-09 13:25:42 +02:00
parent 75c548f2d5
commit e3f98e1ccc
@@ -41,6 +41,7 @@ import {
RiFileCopyLine, RiFileCopyLine,
RiFolderAddLine, RiFolderAddLine,
RiGitBranchLine, RiGitBranchLine,
RiGitPullRequestLine,
RiLinkUnlinkM, RiLinkUnlinkM,
RiGithubLine, RiGithubLine,
@@ -68,6 +69,7 @@ import { useGitStore } from '@/stores/useGitStore';
import { isVSCodeRuntime } from '@/lib/desktop'; import { isVSCodeRuntime } from '@/lib/desktop';
import { updateDesktopSettings } from '@/lib/persistence'; import { updateDesktopSettings } from '@/lib/persistence';
import { GitHubIssuePickerDialog } from './GitHubIssuePickerDialog'; import { GitHubIssuePickerDialog } from './GitHubIssuePickerDialog';
import { GitHubPullRequestPickerDialog } from './GitHubPullRequestPickerDialog';
const ATTENTION_DIAMOND_INDICES = new Set([1, 3, 4, 5, 7]); const ATTENTION_DIAMOND_INDICES = new Set([1, 3, 4, 5, 7]);
@@ -194,6 +196,7 @@ interface SortableProjectItemProps {
onNewSession: () => void; onNewSession: () => void;
onNewWorktreeSession?: () => void; onNewWorktreeSession?: () => void;
onNewSessionFromGitHubIssue?: () => void; onNewSessionFromGitHubIssue?: () => void;
onNewSessionFromGitHubPR?: () => void;
onOpenMultiRunLauncher: () => void; onOpenMultiRunLauncher: () => void;
onRenameStart: () => void; onRenameStart: () => void;
onRenameSave: () => void; onRenameSave: () => void;
@@ -226,6 +229,7 @@ const SortableProjectItem: React.FC<SortableProjectItemProps> = ({
onNewSession, onNewSession,
onNewWorktreeSession, onNewWorktreeSession,
onNewSessionFromGitHubIssue, onNewSessionFromGitHubIssue,
onNewSessionFromGitHubPR,
onOpenMultiRunLauncher, onOpenMultiRunLauncher,
onRenameStart, onRenameStart,
onRenameSave, onRenameSave,
@@ -384,6 +388,12 @@ const SortableProjectItem: React.FC<SortableProjectItemProps> = ({
New session from GitHub issue New session from GitHub issue
</DropdownMenuItem> </DropdownMenuItem>
)} )}
{showCreateButtons && isRepo && !hideDirectoryControls && onNewSessionFromGitHubPR && (
<DropdownMenuItem onClick={onNewSessionFromGitHubPR}>
<RiGitPullRequestLine className="mr-1.5 h-4 w-4" />
New session from GitHub PR
</DropdownMenuItem>
)}
{showCreateButtons && isRepo && !hideDirectoryControls && ( {showCreateButtons && isRepo && !hideDirectoryControls && (
<DropdownMenuItem onClick={onOpenMultiRunLauncher}> <DropdownMenuItem onClick={onOpenMultiRunLauncher}>
<ArrowsMerge className="mr-1.5 h-4 w-4" /> <ArrowsMerge className="mr-1.5 h-4 w-4" />
@@ -534,6 +544,7 @@ export const SessionSidebar: React.FC<SessionSidebarProps> = ({
const [expandedSessionGroups, setExpandedSessionGroups] = React.useState<Set<string>>(new Set()); const [expandedSessionGroups, setExpandedSessionGroups] = React.useState<Set<string>>(new Set());
const [hoveredProjectId, setHoveredProjectId] = React.useState<string | null>(null); const [hoveredProjectId, setHoveredProjectId] = React.useState<string | null>(null);
const [issuePickerOpen, setIssuePickerOpen] = React.useState(false); const [issuePickerOpen, setIssuePickerOpen] = React.useState(false);
const [pullRequestPickerOpen, setPullRequestPickerOpen] = React.useState(false);
const [stuckProjectHeaders, setStuckProjectHeaders] = React.useState<Set<string>>(new Set()); const [stuckProjectHeaders, setStuckProjectHeaders] = React.useState<Set<string>>(new Set());
const [openMenuSessionId, setOpenMenuSessionId] = React.useState<string | null>(null); const [openMenuSessionId, setOpenMenuSessionId] = React.useState<string | null>(null);
const [collapsedGroups, setCollapsedGroups] = React.useState<Set<string>>(() => { const [collapsedGroups, setCollapsedGroups] = React.useState<Set<string>>(() => {
@@ -2308,6 +2319,19 @@ export const SessionSidebar: React.FC<SessionSidebarProps> = ({
</TooltipTrigger> </TooltipTrigger>
<TooltipContent side="bottom" sideOffset={4}><p>New from issue</p></TooltipContent> <TooltipContent side="bottom" sideOffset={4}><p>New from issue</p></TooltipContent>
</Tooltip> </Tooltip>
<Tooltip>
<TooltipTrigger asChild>
<button
type="button"
onClick={() => setPullRequestPickerOpen(true)}
className={headerActionButtonClass}
aria-label="New from PR"
>
<RiGitPullRequestLine className="h-4.5 w-4.5" />
</button>
</TooltipTrigger>
<TooltipContent side="bottom" sideOffset={4}><p>New from PR</p></TooltipContent>
</Tooltip>
<Tooltip> <Tooltip>
<TooltipTrigger asChild> <TooltipTrigger asChild>
<button <button
@@ -2419,6 +2443,12 @@ export const SessionSidebar: React.FC<SessionSidebarProps> = ({
} }
setIssuePickerOpen(true); setIssuePickerOpen(true);
}} }}
onNewSessionFromGitHubPR={() => {
if (projectKey !== activeProjectId) {
setActiveProject(projectKey);
}
setPullRequestPickerOpen(true);
}}
onOpenMultiRunLauncher={() => { onOpenMultiRunLauncher={() => {
if (projectKey !== activeProjectId) { if (projectKey !== activeProjectId) {
setActiveProject(projectKey); setActiveProject(projectKey);
@@ -2525,6 +2555,17 @@ export const SessionSidebar: React.FC<SessionSidebarProps> = ({
} }
}} }}
/> />
<GitHubPullRequestPickerDialog
open={pullRequestPickerOpen}
onOpenChange={(open) => {
setPullRequestPickerOpen(open);
if (!open && mobileVariant) {
setActiveMainTab('chat');
setSessionSwitcherOpen(false);
}
}}
/>
</div> </div>
); );
}; };