feat(tasks): multi-branch tasks — N (repo, branch) pairs per task (#1226)
* feat(tasks): multi-branch tasks — N (repo, branch) pairs per task Extends multi-repo into multi-branch so a single task can hold multiple worktrees on the same repo (one per branch). Sibling worktrees layout at <task>/<repo>/ + <task>/<repo>-<slug>/, dedicated PRWatch per branch, live agentctl tracker rescan + frontend store updates so the UI splits PRs / files / commits per branch without a session restart. MCP add_branch_to_task_kandev tool is shielded to the worktree executor. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(web): unify multi-branch repo label as <repo> · <branch> across panels PR Changes and Commits panels rendered repo labels differently for multi-branch tasks — Commits showed "kandev · feature/x" while PR Changes leaked the raw "kandev-feature-x" agentctl tracker tag. Reformat tracker-tagged repo names via formatRepoLabel using the longest known-repo prefix so kandev-cli-* doesn't collapse to kandev · cli-*. * fix(tasks): address multi-branch PR review — data races, slug collisions, MCP error codes Backend - agentctl process.Manager: add repoTrackersMu RWMutex guarding repoTrackers + workspaceTracker. Reads snapshot under RLock; RescanRepositories builds trackers first, takes Lock for swap/append. Validates newWorkDir via os.Stat before publishing cfg.WorkDir. - worktree.Manager: reject invalid explicit BranchSlug up-front; cache key uses sanitized wt.BranchSlug so read/write paths are symmetric. - worktree.store: narrow isDuplicateColumnError to "duplicate column name". - task service AddBranchToTask: slug-collision guard rejects feat/a vs feat-a. - orchestrator resolvePushRepo: two-pass exact-name match before subdir prefix fallback so "backend" doesn't swallow pushes for "backend-admin". - executor buildRepoSpecs: duplicate repos always get a non-empty BranchSlug (falls back to branch-N when both branch fields sanitize to empty). - MCP handler: classifyAddBranchError maps service errors to NOT_FOUND / CONFLICT / VALIDATION_ERROR; add ErrorCodeConflict constant. - MCP server: extract registerAddBranchToTaskTool, register in task mode only (external mode contract: config tools + create_task_kandev). - workspace_rescan handler: reject malformed JSON with 400 instead of silently rescanning the current root. - branch_materializer: split MaterializeBranch into prepare + finalize helpers to satisfy the 80-line cap. Frontend - existingPrUrl returns undefined when a task has >1 PR so per-repo View PR buttons take over (no silent linking to a sibling). - formatRepoLabel checks exact known-repo match before prefix splitting so "kandev-cli" isn't mislabeled as "kandev · cli". - Repo chip key now includes base_branch so siblings differing only on base render as distinct chips. Docs - multi-branch spec uniqueness wording aligned with the canonical 4-column key (task_id, repository_id, base_branch, checkout_branch). - worktree.CreateRequest.BranchSlug doc describes the sibling layout (<repo>-<slug>) instead of the obsolete nested form. * fix(tasks): scope slug-collision check to repo only + use errors.Is for ErrTaskNotFound - service_branches: drop base_branch from the slug-collision check. Worktree path is (repo, slug); two rows on the same repo cut from different bases still collide on disk. - service_branches: prepareBranchAdd wraps taskrepo.ErrTaskNotFound via fmt.Errorf with %w so classifiers don't have to substring-match the formatted task UUID. - mcp handlers: classifyAddBranchError uses errors.Is(err, ErrTaskNotFound). * fix(agentctl): sanitize rescan work_dir before os.Stat to clear CodeQL path-injection CodeQL flagged the rescan endpoint as a path-injection sink (the HTTP-supplied work_dir flowed straight into os.Stat and downstream scanRepositorySubdirs). Add validateRescanPath which: - requires the input to be a clean absolute path with no ".." segments - rejects anything that isn't equal to or an ancestor of the current cfg.WorkDir — the only legitimate use case is the branch materializer promoting <task>/<repo>/ to <task>/ Defense in depth: agentctl binds to localhost, but any colocated process could otherwise direct it at /etc or the user's home by POSTing /api/v1/workspace/rescan. * fix(agentctl): tighten validateRescanPath, close TOCTOU on existingTrackers, add tests - Drop the strings.Contains(clean, "..") guard. filepath.Clean already resolves traversal; the substring check rejects legitimate names like /home/u/..hidden without adding defense (the ancestor check via filepath.Rel is the real boundary). - Drop the rel == "." branch in the ancestor check — early return for clean == currentClean already covers identity. - Read existingTrackers inside the write-lock section (not under RLock then re-Lock) so two concurrent rescans can't both see 0 trackers and double-bootstrap the multi-repo set. - Add table-driven TestValidateRescanPath covering rejection paths (relative, descendant, sibling, traversal-cleaned, empty input), legitimate ancestor promotion, exact match, no-anchor first-launch, and a /home/u/..hidden dotted-segment case. * fix(agentctl): break taint flow into os.Stat — derive rescan path from cfg, not HTTP body CodeQL's go/path-injection trace still flagged manager_rescan.go after the prior sanitizer because the user-supplied newWorkDir flowed (after validation) into os.Stat and then into cfg.WorkDir → tracker paths → workspace_monitor os.Stat sinks. Replace validateRescanPath with resolveRescanPath: it returns a path DERIVED from currentWorkDir (no-op = currentClean, promotion = filepath.Dir(currentClean)) and uses newPath only for comparison, never as a source for the returned string. os.Stat now receives a path whose provenance is trusted manager config. Functionally the legitimate caller (branch materializer promoting <task>/<repo>/ to <task>/) is unchanged. * test(agentctl): make TestResolveRescanPath windows-portable The Linux Backend Tests job passed but the Backend (windows) job rejected every "absolute" case because filepath.IsAbs("/task/repo") is false on Windows (no volume letter). Build inputs via filepath.Join against absRoot() (filepath.Abs of "/" / "\\") so the same table covers POSIX (`/...`) and Windows (`C:\...`) without per-OS branches. Keep the traversal-after-Clean case POSIX-only since filepath.Clean is the shared primitive and that input form needs a volume to be considered absolute on Windows anyway. * fix(agentctl): serialize RescanRepositories + re-check trackers under write lock Two concurrent RescanRepositories calls could both observe an empty tracker set (between the snapshot read and the bootstrap branch) and both enter transitionToMultiRepoMode, leaking a duplicate bare-root tracker and duplicate per-repo trackers. Same race in appendNewRepoTrackers would double-append the same new child across both callers. Fix: - Add rescanMu sync.Mutex on Manager. Acquired for the full body of RescanRepositories so the snapshot → branch → mutate sequence is serialized. repoTrackersMu still guards individual field reads from unrelated goroutines (subscribe/unsubscribe/poll-mode). - appendNewRepoTrackers re-checks membership inside the write-lock before appending and drops already-present trackers (Stop + detach outside the lock). Defense in depth. - Test: add `dotted segment is legal as promotion` case so the ..hidden-segment promotion path stays exercised. --------- Co-authored-by: Kandev Agent <agent@kandev.dev> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -17,6 +17,7 @@ import { useActiveTaskPRsWithFiles } from "@/hooks/domains/github/use-active-tas
|
||||
import { usePRCommits } from "@/hooks/domains/github/use-pr-commits";
|
||||
import {
|
||||
type ChangedFile,
|
||||
computePRGroupStamp,
|
||||
computeReviewProgress,
|
||||
computeStagedStats,
|
||||
getBaseBranchDisplay,
|
||||
@@ -40,8 +41,13 @@ function useChangesPanelStoreData() {
|
||||
const existingPrUrl = useAppStore((state) => {
|
||||
const taskId = state.tasks.activeTaskId;
|
||||
if (!taskId) return undefined;
|
||||
const fromTaskPR = state.taskPRs.byTaskId[taskId]?.[0]?.pr_url;
|
||||
if (fromTaskPR) return fromTaskPR;
|
||||
// Multi-branch tasks hold N PRs per task. The panel-header "View PR"
|
||||
// button is a single-URL surface, so collapse only when there's exactly
|
||||
// one PR — otherwise the per-repo buttons (prByRepo) take over and the
|
||||
// generic button is hidden to avoid silently linking to a sibling.
|
||||
const taskPRs = state.taskPRs.byTaskId[taskId];
|
||||
if (Array.isArray(taskPRs) && taskPRs.length === 1) return taskPRs[0]?.pr_url;
|
||||
if (Array.isArray(taskPRs) && taskPRs.length > 1) return undefined;
|
||||
return state.pendingPrUrlByTaskId.byTaskId[taskId]?.[""];
|
||||
});
|
||||
return { activeTaskId, activeSessionId, taskTitle, baseBranch, existingPrUrl };
|
||||
@@ -163,11 +169,36 @@ function useChangesPanelPRData() {
|
||||
const { prFiles, prDiffFiles } = useMemo(() => {
|
||||
const merged: PRChangedFile[] = [];
|
||||
const flat: PRDiffFile[] = [];
|
||||
// Multi-branch tasks open multiple PRs on the same repo — files must
|
||||
// split by PR so the agent's two branches don't get conflated under one
|
||||
// "kandev" header. We stamp each row with a label unique per PR.
|
||||
//
|
||||
// - 1 PR total → no stamp (single section header is enough)
|
||||
// - Multi-repo, 1 PR/repo → stamp = repo name (legacy behavior)
|
||||
// - Multi-PR per repo → stamp = "<repo> · <head_branch>" so the
|
||||
// group label still names the repo but
|
||||
// disambiguates the branch the PR is on
|
||||
// - Single repo + N PRs → stamp = head_branch (repo is redundant)
|
||||
const prCountByRepoID = new Map<string, number>();
|
||||
for (const pr of prs) {
|
||||
const key = pr.repository_id ?? "";
|
||||
prCountByRepoID.set(key, (prCountByRepoID.get(key) ?? 0) + 1);
|
||||
}
|
||||
const anyRepoMultiPR = Array.from(prCountByRepoID.values()).some((n) => n > 1);
|
||||
const needsStamp = prs.length > 1;
|
||||
for (const pr of prs) {
|
||||
const key = `${pr.owner}/${pr.repo}/${pr.pr_number}/${pr.last_synced_at ?? ""}`;
|
||||
const files = filesByPRKey[key] ?? [];
|
||||
const repoName = pr.repository_id ? (repoNameById[pr.repository_id] ?? "") : "";
|
||||
const stamp = taskHasMultipleRepos ? repoName || `${pr.owner}/${pr.repo}` : "";
|
||||
const branch = pr.head_branch ?? "";
|
||||
const stamp = computePRGroupStamp({
|
||||
needsStamp,
|
||||
taskHasMultipleRepos,
|
||||
anyRepoMultiPR,
|
||||
repoName: repoName || `${pr.owner}/${pr.repo}`,
|
||||
branch,
|
||||
prNumber: pr.pr_number,
|
||||
});
|
||||
merged.push(...mapPRFilesToChangedFiles(files, stamp));
|
||||
flat.push(...files);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user