Files
kandev/apps/backend/internal/mcp/server/server_test.go
T
João Salavisa fd79d6170f 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>
2026-06-01 19:36:20 +01:00

389 lines
15 KiB
Go

package mcp
import (
"testing"
"github.com/kandev/kandev/internal/common/logger"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func newTestLogger(t *testing.T) *logger.Logger {
t.Helper()
log, err := logger.NewLogger(logger.LoggingConfig{Level: "error", Format: "console"})
require.NoError(t, err)
return log
}
// getRegisteredToolNames returns the names of all tools registered on the MCP server.
func getRegisteredToolNames(s *Server) []string {
toolsMap := s.mcpServer.ListTools()
names := make([]string, 0, len(toolsMap))
for name := range toolsMap {
names = append(names, name)
}
return names
}
func TestServerModeTask_RegistersCorrectTools(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "test-session", "test-task", 10005, log, "", false, ModeTask)
require.NotNil(t, s)
tools := getRegisteredToolNames(s)
// Task mode should have kanban tools
assert.Contains(t, tools, "list_workspaces_kandev")
assert.Contains(t, tools, "list_workflows_kandev")
assert.Contains(t, tools, "list_workflow_steps_kandev")
assert.Contains(t, tools, "list_tasks_kandev")
assert.Contains(t, tools, "create_task_kandev")
assert.Contains(t, tools, "update_task_kandev")
assert.Contains(t, tools, "move_task_kandev")
assert.Contains(t, tools, "message_task_kandev")
assert.Contains(t, tools, "get_task_conversation_kandev")
// Task mode should have plan tools
assert.Contains(t, tools, "create_task_plan_kandev")
assert.Contains(t, tools, "get_task_plan_kandev")
assert.Contains(t, tools, "update_task_plan_kandev")
assert.Contains(t, tools, "delete_task_plan_kandev")
// Task mode should have interaction tools
assert.Contains(t, tools, "ask_user_question_kandev")
// Task mode should have profile listing tools (needed for create_task)
assert.Contains(t, tools, "list_agents_kandev")
assert.Contains(t, tools, "list_executor_profiles_kandev")
// Task mode keeps list_related_tasks_kandev (sibling discovery) but
// drops the task-document tools — those are office-only.
assert.Contains(t, tools, "list_related_tasks_kandev")
assert.NotContains(t, tools, "list_task_documents_kandev")
assert.NotContains(t, tools, "get_task_document_kandev")
assert.NotContains(t, tools, "write_task_document_kandev")
// Task mode exposes delete + archive so agents can clean up the tasks
// they fan out. Restore/unarchive is intentionally NOT exposed via MCP —
// it stays a user action in the UI.
assert.Contains(t, tools, "delete_task_kandev")
assert.Contains(t, tools, "archive_task_kandev")
assert.NotContains(t, tools, "restore_task_kandev")
// Task mode should NOT have config/mutation tools
assert.NotContains(t, tools, "create_workflow_kandev")
assert.NotContains(t, tools, "update_workflow_kandev")
assert.NotContains(t, tools, "delete_workflow_kandev")
assert.NotContains(t, tools, "create_workflow_step_kandev")
assert.NotContains(t, tools, "update_workflow_step_kandev")
assert.NotContains(t, tools, "update_agent_kandev")
assert.NotContains(t, tools, "create_agent_profile_kandev")
assert.NotContains(t, tools, "delete_agent_profile_kandev")
assert.NotContains(t, tools, "list_agent_profiles_kandev")
assert.NotContains(t, tools, "update_agent_profile_kandev")
assert.NotContains(t, tools, "get_mcp_config_kandev")
assert.NotContains(t, tools, "update_mcp_config_kandev")
assert.NotContains(t, tools, "list_executors_kandev")
assert.NotContains(t, tools, "create_executor_profile_kandev")
assert.NotContains(t, tools, "update_executor_profile_kandev")
assert.NotContains(t, tools, "delete_executor_profile_kandev")
assert.NotContains(t, tools, "update_task_state_kandev")
assert.NotContains(t, tools, "delete_workflow_step_kandev")
assert.NotContains(t, tools, "reorder_workflow_steps_kandev")
}
func TestServerModeConfig_RegistersCorrectTools(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "test-session", "test-task", 10005, log, "", false, ModeConfig)
require.NotNil(t, s)
tools := getRegisteredToolNames(s)
// Config mode should have workflow config tools
assert.Contains(t, tools, "list_workspaces_kandev")
assert.Contains(t, tools, "list_workflows_kandev")
assert.Contains(t, tools, "list_repositories_kandev")
assert.Contains(t, tools, "create_workflow_kandev")
assert.Contains(t, tools, "update_workflow_kandev")
assert.Contains(t, tools, "delete_workflow_kandev")
assert.Contains(t, tools, "import_workflow_kandev")
assert.Contains(t, tools, "list_workflow_steps_kandev")
assert.Contains(t, tools, "create_workflow_step_kandev")
assert.Contains(t, tools, "update_workflow_step_kandev")
assert.Contains(t, tools, "delete_workflow_step_kandev")
assert.Contains(t, tools, "reorder_workflow_steps_kandev")
// Config mode should have agent tools
assert.Contains(t, tools, "list_agents_kandev")
assert.Contains(t, tools, "update_agent_kandev")
assert.Contains(t, tools, "create_agent_profile_kandev")
assert.Contains(t, tools, "delete_agent_profile_kandev")
// Config mode should have MCP config tools
assert.Contains(t, tools, "list_agent_profiles_kandev")
assert.Contains(t, tools, "update_agent_profile_kandev")
assert.Contains(t, tools, "get_mcp_config_kandev")
assert.Contains(t, tools, "update_mcp_config_kandev")
// Config mode should have executor profile tools
assert.Contains(t, tools, "list_executors_kandev")
assert.Contains(t, tools, "list_executor_profiles_kandev")
assert.Contains(t, tools, "create_executor_profile_kandev")
assert.Contains(t, tools, "update_executor_profile_kandev")
assert.Contains(t, tools, "delete_executor_profile_kandev")
// Config mode should have task tools
assert.Contains(t, tools, "list_tasks_kandev")
assert.Contains(t, tools, "move_task_kandev")
assert.Contains(t, tools, "delete_task_kandev")
assert.Contains(t, tools, "archive_task_kandev")
assert.Contains(t, tools, "update_task_state_kandev")
assert.Contains(t, tools, "get_task_conversation_kandev")
// Config mode should have interaction tools
assert.Contains(t, tools, "ask_user_question_kandev")
// Config mode should NOT have plan tools
assert.NotContains(t, tools, "create_task_plan_kandev")
assert.NotContains(t, tools, "get_task_plan_kandev")
assert.NotContains(t, tools, "update_task_plan_kandev")
assert.NotContains(t, tools, "delete_task_plan_kandev")
// Config mode should NOT have task-mode kanban create/update tools
assert.NotContains(t, tools, "create_task_kandev")
assert.NotContains(t, tools, "update_task_kandev")
}
func TestServerModeDefault_DefaultsToTask(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "test-session", "test-task", 10005, log, "", false, "")
require.NotNil(t, s)
assert.Equal(t, ModeTask, s.mode)
tools := getRegisteredToolNames(s)
assert.Contains(t, tools, "create_task_kandev")
assert.Contains(t, tools, "create_task_plan_kandev")
assert.NotContains(t, tools, "create_workflow_step_kandev")
}
func TestServerModeConfig_DisableAskQuestion(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "test-session", "test-task", 10005, log, "", true, ModeConfig)
require.NotNil(t, s)
tools := getRegisteredToolNames(s)
assert.NotContains(t, tools, "ask_user_question_kandev")
assert.Contains(t, tools, "list_agents_kandev")
assert.Contains(t, tools, "create_workflow_step_kandev")
}
func TestServerModeTask_DisableAskQuestion(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "test-session", "test-task", 10005, log, "", true, ModeTask)
require.NotNil(t, s)
tools := getRegisteredToolNames(s)
assert.NotContains(t, tools, "ask_user_question_kandev")
assert.Contains(t, tools, "create_task_kandev")
assert.Contains(t, tools, "create_task_plan_kandev")
}
func TestServerModeTask_ToolCount(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "test-session", "test-task", 10005, log, "", false, ModeTask)
tools := getRegisteredToolNames(s)
// 13 kanban (incl. delete + archive task) + 1 add_branch_to_task + 1 interaction
// + 4 plan + 1 related-tasks = 20. Task-document tools (list/get/write) are office-only.
assert.Equal(t, 20, len(tools))
}
func TestServerModeConfig_ToolCount(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "test-session", "test-task", 10005, log, "", false, ModeConfig)
tools := getRegisteredToolNames(s)
// 12 workflow (incl. list_repositories + import_workflow) + 4 agent + 4 mcp + 5 executor + 6 task + 1 interaction = 32
assert.Equal(t, 32, len(tools))
}
func TestServerModeConfig_ToolDescriptions(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "test-session", "test-task", 10005, log, "", false, ModeConfig)
toolsMap := s.mcpServer.ListTools()
assert.Contains(t, toolsMap["create_workflow_step_kandev"].Tool.Description, "Create a new workflow step")
assert.Contains(t, toolsMap["list_agents_kandev"].Tool.Description, "List all configured agents")
assert.Contains(t, toolsMap["get_mcp_config_kandev"].Tool.Description, "Get MCP server configuration")
}
func TestServerModeOffice_RegistersCorrectTools(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "test-session", "test-task", 10005, log, "", false, ModeOffice)
require.NotNil(t, s)
tools := getRegisteredToolNames(s)
// Office mode should have plan tools
assert.Contains(t, tools, "create_task_plan_kandev")
assert.Contains(t, tools, "get_task_plan_kandev")
assert.Contains(t, tools, "update_task_plan_kandev")
assert.Contains(t, tools, "delete_task_plan_kandev")
// Office mode should have interaction tools
assert.Contains(t, tools, "ask_user_question_kandev")
// delegate_task_kandev was removed from ModeOffice when the
// agentctl CLI started covering task creation/delegation via
// `agentctl kandev task create --parent $KANDEV_TASK_ID …`.
assert.NotContains(t, tools, "delegate_task_kandev")
// Office mode exposes the cross-task handoff tools.
assert.Contains(t, tools, "list_related_tasks_kandev")
assert.Contains(t, tools, "list_task_documents_kandev")
assert.Contains(t, tools, "get_task_document_kandev")
assert.Contains(t, tools, "write_task_document_kandev")
// Office mode should NOT have kanban tools
assert.NotContains(t, tools, "create_task_kandev")
assert.NotContains(t, tools, "list_tasks_kandev")
assert.NotContains(t, tools, "update_task_kandev")
assert.NotContains(t, tools, "list_workspaces_kandev")
assert.NotContains(t, tools, "list_workflows_kandev")
assert.NotContains(t, tools, "list_workflow_steps_kandev")
assert.NotContains(t, tools, "list_agents_kandev")
assert.NotContains(t, tools, "list_executor_profiles_kandev")
// Office mode should NOT have config tools
assert.NotContains(t, tools, "create_workflow_kandev")
assert.NotContains(t, tools, "update_workflow_kandev")
assert.NotContains(t, tools, "update_agent_kandev")
}
func TestServerModeOffice_ToolCount(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "test-session", "test-task", 10005, log, "", false, ModeOffice)
tools := getRegisteredToolNames(s)
// 4 plan + 1 interaction + 1 related-tasks + 3 task-documents = 9
// (delegate_task_kandev retired in favour of `agentctl kandev task create …`).
assert.Equal(t, 9, len(tools))
}
func TestServerModeOffice_DisableAskQuestion(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "test-session", "test-task", 10005, log, "", true, ModeOffice)
require.NotNil(t, s)
tools := getRegisteredToolNames(s)
assert.NotContains(t, tools, "ask_user_question_kandev")
assert.Contains(t, tools, "create_task_plan_kandev")
// delegate_task_kandev was retired from ModeOffice (now lives in
// the agentctl CLI as `agentctl kandev task create --parent …`).
assert.NotContains(t, tools, "delegate_task_kandev")
// 4 plan + 1 related-tasks + 3 task-documents = 8 (no ask_user_question, no delegate)
assert.Equal(t, 8, len(tools))
}
func TestServerModeConstants(t *testing.T) {
assert.Equal(t, "task", ModeTask)
assert.Equal(t, "config", ModeConfig)
assert.Equal(t, "external", ModeExternal)
assert.Equal(t, "office", ModeOffice)
}
func TestServerModeExternal_RegistersCorrectTools(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "", "", 0, log, "", true, ModeExternal)
require.NotNil(t, s)
tools := getRegisteredToolNames(s)
// External mode includes all config tools
assert.Contains(t, tools, "list_workspaces_kandev")
assert.Contains(t, tools, "list_repositories_kandev")
assert.Contains(t, tools, "create_workflow_kandev")
assert.Contains(t, tools, "list_agents_kandev")
assert.Contains(t, tools, "get_mcp_config_kandev")
assert.Contains(t, tools, "list_executors_kandev")
assert.Contains(t, tools, "move_task_kandev")
// External mode includes create_task_kandev so external agents can spawn tasks
assert.Contains(t, tools, "create_task_kandev")
// External mode does NOT include session-scoped tools
assert.NotContains(t, tools, "ask_user_question_kandev")
assert.NotContains(t, tools, "create_task_plan_kandev")
assert.NotContains(t, tools, "get_task_plan_kandev")
assert.NotContains(t, tools, "update_task_plan_kandev")
assert.NotContains(t, tools, "delete_task_plan_kandev")
// External mode does NOT include kanban update_task_kandev (config has its own update_task_state)
assert.NotContains(t, tools, "update_task_kandev")
// External mode does NOT include message_task_kandev (no live session context)
assert.NotContains(t, tools, "message_task_kandev")
}
func TestServerModeExternal_ToolCount(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := New(backend, "", "", 0, log, "", true, ModeExternal)
tools := getRegisteredToolNames(s)
// 12 workflow (incl. list_repositories + import_workflow) + 4 agent + 4 mcp + 5 executor + 6 task + 1 create_task = 32.
// add_branch_to_task_kandev is task-mode only — external coding agents have no live session to attach a worktree to.
assert.Equal(t, 32, len(tools))
assert.NotContains(t, tools, "add_branch_to_task_kandev")
}
func TestNewExternal_Constructs(t *testing.T) {
log := newTestLogger(t)
backend := NewChannelBackendClient(log)
defer backend.Close()
s := NewExternal(backend, "http://localhost:38429", log, "")
require.NotNil(t, s)
assert.Equal(t, ModeExternal, s.mode)
assert.True(t, s.disableAskQuestion)
assert.Empty(t, s.sessionID)
assert.Empty(t, s.taskID)
assert.NotNil(t, s.sseServer)
assert.NotNil(t, s.httpServer)
}