fd79d6170f
* 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>
138 lines
3.9 KiB
Go
138 lines
3.9 KiB
Go
package github
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"testing"
|
|
)
|
|
|
|
// stubTaskDeleter implements TaskDeleter for testing.
|
|
type stubTaskDeleter struct {
|
|
err error
|
|
}
|
|
|
|
func (s *stubTaskDeleter) DeleteTask(_ context.Context, _ string) error {
|
|
return s.err
|
|
}
|
|
|
|
// TestCleanupMergedReviewTasks_TaskAlreadyDeleted verifies that when DeleteTask
|
|
// returns "not found" the orphaned dedup record is still removed, preventing the
|
|
// 5-minute poller from logging the same warning indefinitely.
|
|
func TestCleanupMergedReviewTasks_TaskAlreadyDeleted(t *testing.T) {
|
|
_, svc, mockClient, store := setupPollerTest(t)
|
|
ctx := context.Background()
|
|
|
|
// Create a review watch.
|
|
watch := &ReviewWatch{WorkspaceID: "ws-1", Enabled: true}
|
|
if err := store.CreateReviewWatch(ctx, watch); err != nil {
|
|
t.Fatalf("CreateReviewWatch: %v", err)
|
|
}
|
|
|
|
// Create a dedup record pointing to an already-deleted task.
|
|
taskID := "task-already-gone"
|
|
rpt := &ReviewPRTask{
|
|
ReviewWatchID: watch.ID,
|
|
RepoOwner: "acme",
|
|
RepoName: "widget",
|
|
PRNumber: 42,
|
|
PRURL: "https://github.com/acme/widget/pull/42",
|
|
TaskID: taskID,
|
|
}
|
|
if err := store.CreateReviewPRTask(ctx, rpt); err != nil {
|
|
t.Fatalf("CreateReviewPRTask: %v", err)
|
|
}
|
|
|
|
// Mock: PR is merged so shouldDeleteReviewTask returns true.
|
|
mockClient.AddPR(&PR{
|
|
Number: 42,
|
|
State: prStateMerged,
|
|
RepoOwner: "acme",
|
|
RepoName: "widget",
|
|
})
|
|
|
|
// Stub: DeleteTask returns the sentinel-wrapped not-found error as the
|
|
// real adapter (see cmd/kandev/turn_adapters.go's taskDeleterAdapter) does.
|
|
svc.SetTaskDeleter(&stubTaskDeleter{
|
|
err: fmt.Errorf("%w: %s", ErrTaskNotFound, taskID),
|
|
})
|
|
|
|
deleted, err := svc.CleanupMergedReviewTasks(ctx, watch)
|
|
if err != nil {
|
|
t.Fatalf("CleanupMergedReviewTasks returned error: %v", err)
|
|
}
|
|
if deleted != 1 {
|
|
t.Errorf("expected 1 deleted, got %d", deleted)
|
|
}
|
|
|
|
// The orphaned dedup record must be gone.
|
|
remaining, err := store.ListReviewPRTasksByWatch(ctx, watch.ID)
|
|
if err != nil {
|
|
t.Fatalf("ListReviewPRTasksByWatch: %v", err)
|
|
}
|
|
if len(remaining) != 0 {
|
|
t.Errorf("expected 0 remaining dedup records, got %d", len(remaining))
|
|
}
|
|
}
|
|
|
|
// Regression: when a task already has a TaskPR row pointing to PR #1 and
|
|
// AssociatePRWithTask is called with a different PR #2 (e.g. first PR
|
|
// closed, new PR opened — or a multi-branch task gaining a second PR on a
|
|
// different branch), the new row must be inserted as a sibling without
|
|
// touching the existing #1 row. Multi-branch tasks rely on this so two
|
|
// PRs on the same (task, repo) coexist; the old "delete-then-insert"
|
|
// behavior collapsed multi-branch tasks down to one PR row.
|
|
func TestAssociatePRWithTask_AddsSecondPRAsSibling(t *testing.T) {
|
|
svc, store, _ := setupSyncTest(t)
|
|
ctx := context.Background()
|
|
|
|
// Seed an existing association for PR #1.
|
|
if err := store.CreateTaskPR(ctx, &TaskPR{
|
|
TaskID: "t1",
|
|
Owner: "owner",
|
|
Repo: "repo",
|
|
PRNumber: 1,
|
|
PRURL: "https://github.com/owner/repo/pull/1",
|
|
PRTitle: "First",
|
|
HeadBranch: "feat-a",
|
|
BaseBranch: "main",
|
|
State: "closed",
|
|
}); err != nil {
|
|
t.Fatalf("seed TaskPR: %v", err)
|
|
}
|
|
|
|
// Associate a new PR #2 on a different branch.
|
|
newPR := &PR{
|
|
Number: 2,
|
|
Title: "Second",
|
|
HTMLURL: "https://github.com/owner/repo/pull/2",
|
|
HeadBranch: "feat-b",
|
|
BaseBranch: "main",
|
|
State: "open",
|
|
RepoOwner: "owner",
|
|
RepoName: "repo",
|
|
AuthorLogin: "alice",
|
|
}
|
|
tp, err := svc.AssociatePRWithTask(ctx, "t1", "", newPR)
|
|
if err != nil {
|
|
t.Fatalf("AssociatePRWithTask: %v", err)
|
|
}
|
|
if tp.PRNumber != 2 {
|
|
t.Errorf("returned TaskPR.PRNumber=%d, want 2", tp.PRNumber)
|
|
}
|
|
|
|
all, err := store.ListTaskPRsByTask(ctx, "t1")
|
|
if err != nil {
|
|
t.Fatalf("ListTaskPRsByTask: %v", err)
|
|
}
|
|
if len(all) != 2 {
|
|
t.Fatalf("expected 2 PR rows after associating second PR, got %d", len(all))
|
|
}
|
|
nums := map[int]bool{}
|
|
for _, r := range all {
|
|
nums[r.PRNumber] = true
|
|
}
|
|
if !nums[1] || !nums[2] {
|
|
t.Errorf("missing expected PR numbers: %v", nums)
|
|
}
|
|
}
|