Files
kandev/apps/web/components/task/mobile/session-mobile-top-bar-git-controls.tsx
T
Kandev Agent 9e8079de69 feat(multi-repo): per-repo git ops, unified branch endpoint, chip-style task create
Bundles a string of multi-repo fixes and refactors that came up while
testing the feature end-to-end:

- workspace_path stored on multi-repo TaskEnvironment was one level too
  high, so agentctl booted with the wrong WorkDir on cold start; fixed
  in resolveTaskEnvWorkspacePath + GetWorkspaceInfoForSession.
- Stage/Unstage/Discard/Commit/Revert/Reset/Amend now thread `repo`
  through agentctl client → WS handler → frontend hook → SessionGit
  fan-out, so the right git repo is targeted (was running at the task
  root, which isn't a git repo for multi-repo tasks).
- agentctl GitLog is multi-repo aware: when no `repo` is specified and
  per-repo trackers exist, fans out one log per repo and merges sorted
  newest-first with RepositoryName stamped on each commit.
- Per-repo grouping for files (Changes panel) and commits, with
  collapsible group headers; commits section defaults to collapsed.
  Algorithm extracted into one generic groupByRepositoryName helper
  (was copy-pasted three times).
- Task creation dialog rewritten around a unified `fs.repositories[]`
  list — no more "primary vs extras" split. Chip-style row with one
  pill per repo + branch, "+" to add, x to remove, GitHub URL toggle
  inline. Discovered (on-machine) repos appear in any chip's dropdown.
  Removes ~6 fields and 3 helpers from the dialog state.
- Branch listing endpoints collapsed to one:
  GET /workspaces/:id/branches?repository_id=X | path=Y
  Frontend collapses to a single useBranches hook with a tagged-union
  source. Drops two HTTP routes, two service methods, two API client
  funcs, and one whole hook file.

Tests added across the chain: workspace_path resolver, sort-commits-
by-date, manager poll-mode propagation, RepoSubpaths, chip grouping
+ collapse + per-repo isLatest, group-by-repo helper, dialog payload
builder + chip wiring + discovered-repo flow.
2026-04-26 21:23:48 +01:00

511 lines
16 KiB
TypeScript

"use client";
import { useCallback, useState } from "react";
import {
IconGitCommit,
IconGitPullRequest,
IconCloudDownload,
IconCloudUpload,
IconGitCherryPick,
IconGitMerge,
IconDots,
IconCheck,
IconLoader2,
IconAlertTriangle,
} from "@tabler/icons-react";
import { Button } from "@kandev/ui/button";
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
DialogFooter,
DialogClose,
} from "@kandev/ui/dialog";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
DropdownMenuSeparator,
DropdownMenuSub,
DropdownMenuSubTrigger,
DropdownMenuSubContent,
} from "@kandev/ui/dropdown-menu";
import { Input } from "@kandev/ui/input";
import { Textarea } from "@kandev/ui/textarea";
import { Checkbox } from "@kandev/ui/checkbox";
import { Label } from "@kandev/ui/label";
import { useGitOperations } from "@/hooks/use-git-operations";
import { useSessionGit } from "@/hooks/domains/session/use-session-git";
import type { FileInfo } from "@/lib/state/slices";
import { useToast } from "@/components/toast-provider";
import {
CommitSummary,
MobilePRBranchSummary,
PRSubmitButton,
} from "./session-mobile-top-bar-dialog-parts";
export function computeUncommittedStats(files: Record<string, FileInfo> | undefined) {
let additions = 0;
let deletions = 0;
if (files) {
for (const file of Object.values(files) as FileInfo[]) {
additions += file.additions || 0;
deletions += file.deletions || 0;
}
}
return { additions, deletions, count: files ? Object.keys(files).length : 0 };
}
type GitOperationRunner = () => Promise<{ success: boolean; output: string; error?: string }>;
function useGitToast() {
const { toast } = useToast();
return useCallback(
async (operation: GitOperationRunner, operationName: string) => {
try {
const result = await operation();
if (result.success) {
toast({
title: `${operationName} successful`,
description: result.output.slice(0, 200) || `${operationName} completed successfully`,
variant: "success",
});
} else {
toast({
title: `${operationName} failed`,
description: result.error || "An error occurred",
variant: "error",
});
}
} catch (error) {
toast({
title: `${operationName} failed`,
description: error instanceof Error ? error.message : "An unexpected error occurred",
variant: "error",
});
}
},
[toast],
);
}
function useCommitDialogForm(
onOpenChange: (open: boolean) => void,
onCommit: (message: string, stageAll: boolean) => void,
) {
const [commitMessage, setCommitMessage] = useState("");
const [commitBody, setCommitBody] = useState("");
const [stageAll, setStageAll] = useState(true);
const handleOpen = (isOpen: boolean) => {
if (isOpen) {
setCommitMessage("");
setCommitBody("");
setStageAll(true);
}
onOpenChange(isOpen);
};
const handleCommit = () => {
const title = commitMessage.trim();
const body = commitBody.trim();
const fullMessage = body ? `${title}\n\n${body}` : title;
onCommit(fullMessage, stageAll);
};
return {
commitMessage,
setCommitMessage,
commitBody,
setCommitBody,
stageAll,
setStageAll,
handleOpen,
handleCommit,
};
}
export function CommitDialog({
open,
onOpenChange,
uncommittedCount,
uncommittedAdditions,
uncommittedDeletions,
isGitLoading,
onCommit,
}: {
open: boolean;
onOpenChange: (open: boolean) => void;
uncommittedCount: number;
uncommittedAdditions: number;
uncommittedDeletions: number;
isGitLoading: boolean;
onCommit: (message: string, stageAll: boolean) => void;
}) {
const form = useCommitDialogForm(onOpenChange, onCommit);
return (
<Dialog open={open} onOpenChange={form.handleOpen}>
<DialogContent className="max-w-[90vw] sm:max-w-[500px]">
<DialogHeader>
<DialogTitle className="flex items-center gap-2">
<IconGitCommit className="h-5 w-5 text-amber-500" />
Commit Changes
</DialogTitle>
</DialogHeader>
<div className="space-y-4 py-2">
<div className="text-sm text-muted-foreground">
<CommitSummary
uncommittedCount={uncommittedCount}
uncommittedAdditions={uncommittedAdditions}
uncommittedDeletions={uncommittedDeletions}
/>
</div>
<Input
data-testid="commit-title-input"
placeholder="Enter commit message..."
value={form.commitMessage}
onChange={(e) => form.setCommitMessage(e.target.value)}
autoFocus
/>
<div className="space-y-2">
<Label htmlFor="commit-body-mobile" className="text-sm">
Description
</Label>
<Textarea
id="commit-body-mobile"
data-testid="commit-body-input"
placeholder="Add details about this change..."
value={form.commitBody}
onChange={(e) => form.setCommitBody(e.target.value)}
rows={3}
className="resize-none max-h-[200px] overflow-y-auto"
/>
</div>
<div className="flex items-center gap-2">
<Checkbox
id="stage-all-mobile"
checked={form.stageAll}
onCheckedChange={(checked) => form.setStageAll(checked === true)}
/>
<Label
htmlFor="stage-all-mobile"
className="text-sm text-muted-foreground cursor-pointer"
>
Stage all changes before committing
</Label>
</div>
</div>
<DialogFooter>
<DialogClose asChild>
<Button type="button" variant="outline">
Cancel
</Button>
</DialogClose>
<Button
className="cursor-pointer"
onClick={form.handleCommit}
disabled={!form.commitMessage.trim() || isGitLoading}
>
{isGitLoading ? (
<>
<IconLoader2 className="h-4 w-4 animate-spin mr-2" />
Committing...
</>
) : (
<>
<IconCheck className="h-4 w-4 mr-2" />
Commit
</>
)}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
);
}
export function PRDialog({
open,
onOpenChange,
displayBranch,
baseBranch,
isGitLoading,
taskTitle,
firstCommitMessage,
onCreatePR,
}: {
open: boolean;
onOpenChange: (open: boolean) => void;
displayBranch: string | undefined;
baseBranch: string | undefined;
isGitLoading: boolean;
taskTitle: string | undefined;
firstCommitMessage?: string;
onCreatePR: (title: string, body: string, draft: boolean) => void;
}) {
const [prTitle, setPrTitle] = useState("");
const [prBody, setPrBody] = useState("");
const [prDraft, setPrDraft] = useState(true);
const handleOpen = (isOpen: boolean) => {
if (isOpen) {
setPrTitle(firstCommitMessage || taskTitle || "");
setPrBody("");
}
onOpenChange(isOpen);
};
return (
<Dialog open={open} onOpenChange={handleOpen}>
<DialogContent className="max-w-[90vw] sm:max-w-[500px]">
<DialogHeader>
<DialogTitle className="flex items-center gap-2">
<IconGitPullRequest className="h-5 w-5 text-cyan-500" />
Create Pull Request
</DialogTitle>
</DialogHeader>
<div className="space-y-4 py-2">
<MobilePRBranchSummary displayBranch={displayBranch} baseBranch={baseBranch} />
<div className="space-y-2">
<Label htmlFor="pr-title-mobile" className="text-sm">
Title
</Label>
<input
id="pr-title-mobile"
type="text"
placeholder="Pull request title..."
value={prTitle}
onChange={(e) => setPrTitle(e.target.value)}
className="flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
autoFocus
/>
</div>
<div className="space-y-2">
<Label htmlFor="pr-body-mobile" className="text-sm">
Description
</Label>
<Textarea
id="pr-body-mobile"
placeholder="Describe your changes..."
value={prBody}
onChange={(e) => setPrBody(e.target.value)}
rows={4}
className="resize-none max-h-[200px] overflow-y-auto"
/>
</div>
<div className="flex items-center space-x-2">
<Checkbox
id="pr-draft-mobile"
checked={prDraft}
onCheckedChange={(checked) => setPrDraft(checked === true)}
/>
<Label htmlFor="pr-draft-mobile" className="text-sm cursor-pointer">
Create as draft
</Label>
</div>
</div>
<DialogFooter>
<DialogClose asChild>
<Button type="button" variant="outline">
Cancel
</Button>
</DialogClose>
<PRSubmitButton
prTitle={prTitle}
prBody={prBody}
prDraft={prDraft}
isGitLoading={isGitLoading}
onCreatePR={onCreatePR}
/>
</DialogFooter>
</DialogContent>
</Dialog>
);
}
export type GitActionsDropdownProps = {
sessionId: string | null | undefined;
isGitLoading: boolean;
uncommittedCount: number;
baseBranch: string | undefined;
onCommitClick: () => void;
onPRClick: () => void;
onPull: () => void;
onPush: (force?: boolean) => void;
onRebase: () => void;
onMerge: () => void;
};
export function GitActionsDropdown({
sessionId,
isGitLoading,
uncommittedCount,
baseBranch,
onCommitClick,
onPRClick,
onPull,
onPush,
onRebase,
onMerge,
}: GitActionsDropdownProps) {
const disabled = isGitLoading || !sessionId;
return (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button size="icon-sm" variant="ghost" className="cursor-pointer">
{isGitLoading ? (
<IconLoader2 className="h-4 w-4 animate-spin" />
) : (
<IconDots className="h-4 w-4" />
)}
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-56">
<DropdownMenuItem
className="cursor-pointer gap-3"
onClick={onCommitClick}
disabled={disabled}
>
<IconGitCommit className={`h-4 w-4 ${uncommittedCount > 0 ? "text-amber-500" : ""}`} />
<span className="flex-1">Commit</span>
{uncommittedCount > 0 && (
<span className="rounded-full bg-amber-500/20 px-1.5 py-0.5 text-xs font-medium text-amber-600">
{uncommittedCount}
</span>
)}
</DropdownMenuItem>
<DropdownMenuItem className="cursor-pointer gap-3" onClick={onPRClick} disabled={disabled}>
<IconGitPullRequest className="h-4 w-4 text-cyan-500" />
<span className="flex-1">Create PR</span>
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem className="cursor-pointer gap-3" onClick={onPull} disabled={disabled}>
<IconCloudDownload className="h-4 w-4 text-blue-500" />
<span className="flex-1">Pull</span>
</DropdownMenuItem>
<DropdownMenuSub>
<DropdownMenuSubTrigger className="cursor-pointer gap-3" disabled={disabled}>
<IconCloudUpload className="h-4 w-4 text-green-500" />
<span className="flex-1">Push</span>
</DropdownMenuSubTrigger>
<DropdownMenuSubContent>
<DropdownMenuItem
className="cursor-pointer gap-3"
onClick={() => onPush(false)}
disabled={disabled}
>
<IconCloudUpload className="h-4 w-4 text-green-500" />
<span>Push</span>
</DropdownMenuItem>
<DropdownMenuItem
className="cursor-pointer gap-3"
onClick={() => onPush(true)}
disabled={disabled}
>
<IconAlertTriangle className="h-4 w-4 text-orange-500" />
<span>Force Push</span>
</DropdownMenuItem>
</DropdownMenuSubContent>
</DropdownMenuSub>
<DropdownMenuSeparator />
<DropdownMenuItem className="cursor-pointer gap-3" onClick={onRebase} disabled={disabled}>
<IconGitCherryPick className="h-4 w-4 text-orange-500" />
<span className="flex-1">Rebase</span>
<span className="text-xs text-muted-foreground">onto {baseBranch || "main"}</span>
</DropdownMenuItem>
<DropdownMenuItem className="cursor-pointer gap-3" onClick={onMerge} disabled={disabled}>
<IconGitMerge className="h-4 w-4 text-purple-500" />
<span className="flex-1">Merge</span>
<span className="text-xs text-muted-foreground">from {baseBranch || "main"}</span>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
);
}
export function useMobileGitActions(
sessionId: string | null | undefined,
baseBranch: string | undefined,
setCommitDialogOpen: (v: boolean) => void,
setPrDialogOpen: (v: boolean) => void,
) {
const { toast } = useToast();
// SessionGit's commit fans out per-repo for multi-repo workspaces; the raw
// useGitOperations.commit hits the workspace root and fails on multi-repo
// tasks. Pull from useGitOperations only what SessionGit doesn't override.
const { pull, push, rebase, merge, createPR, isLoading: isGitLoading } = useGitOperations(
sessionId ?? null,
);
const { commit } = useSessionGit(sessionId ?? null);
const handleGitOperation = useGitToast();
const handlePull = useCallback(
() => handleGitOperation(() => pull(), "Pull"),
[handleGitOperation, pull],
);
const handlePush = useCallback(
(force = false) => handleGitOperation(() => push({ force }), force ? "Force Push" : "Push"),
[handleGitOperation, push],
);
const handleRebase = useCallback(() => {
const target = baseBranch?.replace(/^origin\//, "") || "main";
return handleGitOperation(() => rebase(target), "Rebase");
}, [handleGitOperation, rebase, baseBranch]);
const handleMerge = useCallback(() => {
const target = baseBranch?.replace(/^origin\//, "") || "main";
return handleGitOperation(() => merge(target), "Merge");
}, [handleGitOperation, merge, baseBranch]);
const handleCommit = useCallback(
async (message: string, stageAll: boolean) => {
setCommitDialogOpen(false);
await handleGitOperation(() => commit(message, stageAll), "Commit");
},
[handleGitOperation, commit, setCommitDialogOpen],
);
const handleCreatePR = useCallback(
async (title: string, body: string, draft: boolean) => {
setPrDialogOpen(false);
try {
const result = await createPR(title, body, baseBranch, draft);
if (result.success) {
toast({
title: draft ? "Draft Pull Request created" : "Pull Request created",
description: result.pr_url || "PR created successfully",
variant: "success",
});
if (result.pr_url) window.open(result.pr_url, "_blank");
} else {
toast({
title: "Create PR failed",
description: result.error || "An error occurred",
variant: "error",
});
}
} catch (e) {
toast({
title: "Create PR failed",
description: e instanceof Error ? e.message : "An error occurred",
variant: "error",
});
}
},
[createPR, baseBranch, toast, setPrDialogOpen],
);
return {
isGitLoading,
handlePull,
handlePush,
handleRebase,
handleMerge,
handleCommit,
handleCreatePR,
};
}