Files
kandev/apps/web/components/task/task-top-bar.tsx
T
João Salavisa a1013342a3 feat: Real-time Git Status Integration (#8)
* feat: implement real-time git status integration

- Add workspace tracker to monitor git changes every 2 seconds
- Implement WebSocket streaming for git status updates
- Add database persistence for git status in agent session metadata
- Compute diffs backend-side with additions/deletions per file
- Integrate git status into frontend UI (top bar, files panel, changes panel)
- Display real-time ahead/behind commits and line changes
- Show file diffs with syntax highlighting in task view
- Add retry logic for WebSocket connections during reconciliation
- Fix context lifecycle issue in workspace tracker

* refactor: remove debug and unnecessary logging

- Remove debug logs from workspace tracker
- Remove info logs from WebSocket handlers
- Remove verbose git status update logs
- Keep only essential error logs

* fix: compare git diff against remote branch instead of HEAD

- Changed git diff comparison from HEAD to remote tracking branch
- Now shows all changes including committed files that haven't been pushed
- Files committed locally but not pushed will appear in the diff
- Falls back to HEAD if no remote branch is configured

* fix: prevent stale git status when switching tasks

- Clear git status when switching to a new task
- Only accept git.status WebSocket updates for the current task
- Prevents showing git data from previous task when switching

* refactor: remove unused diff stream client code

- Remove diffConn field from agentctl Client struct
- Remove StreamDiff() method (never called)
- Remove CloseDiffStream() method
- Remove DiffUpdate type from client.go
- All diff data is already included in GitStatusUpdate.Files
- Keep server-side diff endpoint in agentctl for potential future use

* refactor: remove unused diff stream server-side code

- Remove /workspace/diff/stream endpoint from agentctl API
- Remove handleDiffStreamWS handler
- Remove DiffUpdate type from workspace_tracker.go
- Remove DiffSubscriber type
- Remove updateDiff() and getDiff() methods
- Remove SubscribeDiff(), UnsubscribeDiff() methods
- Remove notifyDiffSubscribers() method
- Remove GetCurrentDiff() method
- Remove currentDiff field and diffSubscribers map
- All diff data is already included in GitStatusUpdate.Files

* refactor: remove unused output stream code

- Remove /output and /output/stream endpoints from agentctl API
- Remove handleGetOutput and handleOutputStreamWS handlers
- Delete output.go file entirely
- Remove OutputBuffer and related code (buffer.go deleted)
- Remove outputConn field from agentctl Client
- Remove StreamOutput() and CloseOutputStream() methods
- Remove OutputLine type from client.go
- Remove OutputBufferSize config option
- Update readStderr to just log instead of buffering

Output data flows through ACP stream (StreamUpdates) which includes
all session notifications. The separate output stream was never used.
2026-01-12 23:44:29 +00:00

351 lines
13 KiB
TypeScript

'use client';
import { memo, useMemo, useState } from 'react';
import Link from 'next/link';
import {
IconArrowDown,
IconArrowLeft,
IconBrandVscode,
IconChevronDown,
IconChevronRight,
IconCopy,
IconEye,
IconFolder,
IconGitBranch,
IconGitFork,
IconGitMerge,
IconGitPullRequest,
IconLoader2,
IconPencil,
IconPlayerPlay,
IconPlayerStop,
} from '@tabler/icons-react';
import { Button } from '@kandev/ui/button';
import { CommitStatBadge, LineStat } from '@/components/diff-stat';
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@kandev/ui/dropdown-menu';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@kandev/ui/select';
import { Tooltip, TooltipContent, TooltipTrigger } from '@kandev/ui/tooltip';
import { useAppStore } from '@/components/state-provider';
type TaskTopBarProps = {
taskTitle?: string;
baseBranch?: string;
branches?: string[];
branchesLoading?: boolean;
onStartAgent?: () => void;
onStopAgent?: () => void;
isAgentRunning?: boolean;
isAgentLoading?: boolean;
worktreePath?: string | null;
worktreeBranch?: string | null;
};
const TaskTopBar = memo(function TaskTopBar({
taskTitle,
baseBranch,
branches = [],
branchesLoading = false,
onStartAgent,
onStopAgent,
isAgentRunning = false,
isAgentLoading = false,
worktreePath,
worktreeBranch,
}: TaskTopBarProps) {
const [branchName, setBranchName] = useState('feature/agent-ui');
const [isEditingBranch, setIsEditingBranch] = useState(false);
const [selectedBaseBranch, setSelectedBaseBranch] = useState(baseBranch ?? 'origin/main');
// Get git status from store
const gitStatus = useAppStore((state) => state.gitStatus);
// Calculate total additions and deletions from all files
const { totalAdditions, totalDeletions } = useMemo(() => {
if (!gitStatus.files || Object.keys(gitStatus.files).length === 0) {
return { totalAdditions: 0, totalDeletions: 0 };
}
return Object.values(gitStatus.files).reduce(
(acc, file) => ({
totalAdditions: acc.totalAdditions + (file.additions || 0),
totalDeletions: acc.totalDeletions + (file.deletions || 0),
}),
{ totalAdditions: 0, totalDeletions: 0 }
);
}, [gitStatus.files]);
return (
<header className="flex items-center justify-between p-3">
<div className="flex items-center gap-3">
<Button variant="ghost" size="sm" asChild>
<Link href="/">
<IconArrowLeft className="h-4 w-4" />
Back
</Link>
</Button>
<span className="text-xs text-muted-foreground">{taskTitle ?? 'Task details'}</span>
<div className="flex items-center gap-2">
<div className="group flex items-center gap-2 rounded-md px-2 h-8 hover:bg-muted/40 cursor-default">
<IconGitFork className="h-4 w-4 text-muted-foreground" />
{isEditingBranch ? (
<input
className="bg-background text-sm outline-none w-[160px] rounded-md border border-border/70 px-1"
value={branchName}
onChange={(event) => setBranchName(event.target.value)}
onBlur={() => setIsEditingBranch(false)}
onKeyDown={(event) => {
if (event.key === 'Enter' || event.key === 'Escape') {
setIsEditingBranch(false);
}
}}
autoFocus
/>
) : (
<>
<span className="text-sm font-medium">{branchName}</span>
<div className="flex items-center gap-1 opacity-0 group-hover:opacity-100">
<Tooltip>
<TooltipTrigger asChild>
<button
type="button"
className="text-muted-foreground hover:text-foreground cursor-pointer"
onClick={() => setIsEditingBranch(true)}
>
<IconPencil className="h-3.5 w-3.5" />
</button>
</TooltipTrigger>
<TooltipContent>Edit branch name</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger asChild>
<button
type="button"
className="text-muted-foreground hover:text-foreground cursor-pointer"
onClick={() => navigator.clipboard?.writeText(branchName)}
>
<IconCopy className="h-3.5 w-3.5" />
</button>
</TooltipTrigger>
<TooltipContent>Copy branch name</TooltipContent>
</Tooltip>
</div>
</>
)}
</div>
<IconChevronRight className="h-4 w-4 text-muted-foreground" />
<Select
value={selectedBaseBranch}
onValueChange={setSelectedBaseBranch}
disabled={branches.length === 0 && !branchesLoading}
>
<Tooltip>
<TooltipTrigger asChild>
<SelectTrigger className="w-[190px] h-8 cursor-pointer border border-transparent bg-transparent hover:bg-muted/40 data-[state=open]:bg-background data-[state=open]:border-border/70">
<SelectValue
placeholder={branchesLoading ? 'Loading branches...' : 'Base branch'}
/>
</SelectTrigger>
</TooltipTrigger>
<TooltipContent>Change base branch</TooltipContent>
</Tooltip>
<SelectContent>
{branches.length === 0 ? (
<SelectItem value={selectedBaseBranch} disabled>
{selectedBaseBranch}
</SelectItem>
) : (
branches.map((branch) => (
<SelectItem key={branch} value={branch}>
{branch}
</SelectItem>
))
)}
</SelectContent>
</Select>
</div>
{/* Git Status: Ahead/Behind */}
{(gitStatus.ahead > 0 || gitStatus.behind > 0) && (
<div className="flex items-center gap-1">
{gitStatus.ahead > 0 && (
<Tooltip>
<TooltipTrigger asChild>
<span className="cursor-default">
<CommitStatBadge label={`${gitStatus.ahead} ahead`} tone="ahead" />
</span>
</TooltipTrigger>
<TooltipContent>
{gitStatus.ahead} commit{gitStatus.ahead !== 1 ? 's' : ''} ahead of {gitStatus.remote_branch || 'remote'}
</TooltipContent>
</Tooltip>
)}
{gitStatus.behind > 0 && (
<Tooltip>
<TooltipTrigger asChild>
<span className="cursor-default">
<CommitStatBadge label={`${gitStatus.behind} behind`} tone="behind" />
</span>
</TooltipTrigger>
<TooltipContent>
{gitStatus.behind} commit{gitStatus.behind !== 1 ? 's' : ''} behind {gitStatus.remote_branch || 'remote'}
</TooltipContent>
</Tooltip>
)}
</div>
)}
{/* Git Status: Lines Changed */}
{(totalAdditions > 0 || totalDeletions > 0) && (
<Tooltip>
<TooltipTrigger asChild>
<span className="cursor-default">
<LineStat added={totalAdditions} removed={totalDeletions} />
</span>
</TooltipTrigger>
<TooltipContent>Lines changed</TooltipContent>
</Tooltip>
)}
{/* Worktree Info */}
{worktreePath && (
<div className="flex items-center gap-2 ml-2 pl-2 border-l border-border/50">
<Tooltip>
<TooltipTrigger asChild>
<div className="group flex items-center gap-1.5 rounded-md px-2 h-7 bg-muted/40 hover:bg-muted/60 cursor-pointer">
<IconFolder className="h-3.5 w-3.5 text-muted-foreground" />
<span className="text-xs text-muted-foreground max-w-[200px] truncate">
{worktreePath}
</span>
<button
type="button"
className="text-muted-foreground hover:text-foreground opacity-0 group-hover:opacity-100"
onClick={(e) => {
e.stopPropagation();
navigator.clipboard?.writeText(worktreePath);
}}
>
<IconCopy className="h-3 w-3" />
</button>
</div>
</TooltipTrigger>
<TooltipContent className="max-w-[400px]">
<div className="space-y-1">
<div className="font-medium">Worktree Path</div>
<div className="text-xs text-muted-foreground break-all">{worktreePath}</div>
{worktreeBranch && (
<div className="text-xs">
Branch: <span className="font-mono">{worktreeBranch}</span>
</div>
)}
</div>
</TooltipContent>
</Tooltip>
</div>
)}
</div>
<div className="flex items-center gap-2">
{/* Start/Stop Agent Button */}
{isAgentRunning ? (
<Tooltip>
<TooltipTrigger asChild>
<Button
size="sm"
variant="destructive"
className="cursor-pointer"
onClick={onStopAgent}
disabled={isAgentLoading}
>
{isAgentLoading ? (
<IconLoader2 className="h-4 w-4 animate-spin" />
) : (
<IconPlayerStop className="h-4 w-4" />
)}
Stop Agent
</Button>
</TooltipTrigger>
<TooltipContent>Stop the agent</TooltipContent>
</Tooltip>
) : (
<Tooltip>
<TooltipTrigger asChild>
<Button
size="sm"
variant="default"
className="cursor-pointer"
onClick={onStartAgent}
disabled={isAgentLoading}
>
{isAgentLoading ? (
<IconLoader2 className="h-4 w-4 animate-spin" />
) : (
<IconPlayerPlay className="h-4 w-4" />
)}
Start Agent
</Button>
</TooltipTrigger>
<TooltipContent>Start the agent on this task</TooltipContent>
</Tooltip>
)}
<Tooltip>
<TooltipTrigger asChild>
<Button size="sm" variant="outline" className="cursor-pointer">
<IconBrandVscode className="h-4 w-4" />
Editor
</Button>
</TooltipTrigger>
<TooltipContent>Open in editor</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger asChild>
<Button size="sm" variant="outline" className="cursor-pointer">
<IconArrowDown className="h-4 w-4" />
Pull
</Button>
</TooltipTrigger>
<TooltipContent>Pull from remote</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger asChild>
<Button size="sm" variant="outline" className="cursor-pointer">
<IconEye className="h-4 w-4" />
Review
</Button>
</TooltipTrigger>
<TooltipContent>Open review</TooltipContent>
</Tooltip>
<div className="inline-flex rounded-md border border-border overflow-hidden">
<Tooltip>
<TooltipTrigger asChild>
<Button size="sm" variant="outline" className="rounded-none border-0 cursor-pointer">
<IconGitPullRequest className="h-4 w-4" />
Create PR
</Button>
</TooltipTrigger>
<TooltipContent>Create PR</TooltipContent>
</Tooltip>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button size="sm" variant="outline" className="rounded-none border-0 px-2 cursor-pointer">
<IconChevronDown className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem>
<IconPencil className="h-4 w-4" />
Create PR manually
</DropdownMenuItem>
<DropdownMenuItem>
<IconGitMerge className="h-4 w-4" />
Merge
</DropdownMenuItem>
<DropdownMenuItem>
<IconGitBranch className="h-4 w-4" />
Rebase
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
</div>
</header>
);
});
export { TaskTopBar };