Skip to content

feat(terminal): add scope badge to terminal selector #662

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

Open
notkainoa wants to merge 1 commit into
base: main
Choose a base branch
from
+33 −2
Open

feat(terminal): add scope badge to terminal selector #662

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
35 changes: 33 additions & 2 deletions src/renderer/components/TaskTerminalPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,19 @@ const TaskTerminalPanelComponent: React.FC<Props> = ({
// Get current active terminal info
const activeTerminalId = parsed?.id ?? null;

// Get display info for the selected terminal
const selectedTerminalInfo = useMemo(() => {
if (!parsed) return null;
const terminals = parsed.mode === 'task' ? taskTerminals.terminals : globalTerminals.terminals;
const terminal = terminals.find((t) => t.id === parsed.id);
if (!terminal) return null;
return {
title: terminal.title,
scope: parsed.mode === 'task' ? 'Worktree' : 'Global',
isWorktree: parsed.mode === 'task',
};
}, [parsed, taskTerminals.terminals, globalTerminals.terminals]);

// Total terminal count for close button visibility
const totalTerminals = taskTerminals.terminals.length + globalTerminals.terminals.length;

Expand Down Expand Up @@ -265,8 +278,26 @@ const TaskTerminalPanelComponent: React.FC<Props> = ({
<div className="flex items-center gap-2 border-b border-border bg-muted px-2 py-1.5 dark:bg-background">
<Select value={selectedValue ?? undefined} onValueChange={handleSelectChange}>
<SelectTrigger className="h-7 min-w-0 flex-1 border-none bg-transparent px-2 text-xs shadow-none">
<Terminal className="mr-1.5 h-3.5 w-3.5 shrink-0" />
<SelectValue placeholder="Select terminal" />
<Terminal className="h-3.5 w-3.5 shrink-0" />
{selectedTerminalInfo ? (
<>
<span
className={cn(
'ml-1 mr-3 shrink-0 rounded px-1 py-0.5 text-[9px] font-medium uppercase tracking-wide',
selectedTerminalInfo.isWorktree
? 'bg-blue-500/15 text-blue-600 dark:bg-blue-400/15 dark:text-blue-400'
: 'bg-zinc-500/15 text-zinc-600 dark:bg-zinc-400/15 dark:text-zinc-400'
)}
>
{selectedTerminalInfo.scope}
</span>
<span className="min-w-0 truncate">{selectedTerminalInfo.title}</span>
</>
) : (
<span className="ml-1.5">
<SelectValue placeholder="Select terminal" />
</span>
)}
</SelectTrigger>
<SelectContent>
{task && (
Expand Down