fix(mcp): allow workspace roots in analysis validation

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>

Author: tae2089

internal/mcp/handler_analysis.go

@@ -3,9 +3,7 @@ package mcp
 import (
 	"context"
 	"fmt"
-	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/tae2089/trace"
@@ -405,27 +403,83 @@ func validateRepoRootWithin(repoRoot, configuredRepoRoot, workspaceRoot string)
 	if repoRoot == "" {
 		return "", fmt.Errorf("repo_root is required")
 	}
-	allowed := configuredRepoRoot
-	if allowed == "" {
-		allowed = workspaceRoot
-	}
-	if allowed == "" {
+	allowedRoots := configuredAnalysisRoots(configuredRepoRoot, workspaceRoot)
+	if len(allowedRoots) == 0 {
 		return "", fmt.Errorf("analysis repo root is not configured")
 	}
 	repo, err := canonicalPath(repoRoot)
 	if err != nil {
 		return "", fmt.Errorf("invalid repo_root: %w", err)
 	}
-	base, err := canonicalPath(allowed)
+	allowed, err := validatePathWithinAllowedRoots(repo, allowedRoots)
 	if err != nil {
 		return "", fmt.Errorf("invalid configured repo root: %w", err)
 	}
-	if repo != base && !strings.HasPrefix(repo, base+string(os.PathSeparator)) {
+	if !allowed {
 		return "", fmt.Errorf("repo_root %q is outside configured analysis root", repoRoot)
 	}
 	return repo, nil
 }
 
+func configuredAnalysisRoots(repoRoot, workspaceRoot string) []string {
+	roots := make([]string, 0, 2)
+	for _, root := range []string{repoRoot, workspaceRoot} {
+		if root == "" {
+			continue
+		}
+		if !sliceContainsString(roots, root) {
+			roots = append(roots, root)
+		}
+	}
+	return roots
+}
+
+func sliceContainsString(values []string, target string) bool {
+	for _, value := range values {
+		if value == target {
+			return true
+		}
+	}
+	return false
+}
+
+func validatePathWithinAllowedRoots(target string, allowedRoots []string) (bool, error) {
+	for _, root := range allowedRoots {
+		base, err := canonicalPath(root)
+		if err != nil {
+			return false, err
+		}
+		within, err := isWithinRoot(base, target)
+		if err != nil {
+			return false, err
+		}
+		if within {
+			return true, nil
+		}
+	}
+	return false, nil
+}
+
+func isWithinRoot(root, target string) (bool, error) {
+	rel, err := filepath.Rel(root, target)
+	if err != nil {
+		return false, err
+	}
+	if rel == "." {
+		return true, nil
+	}
+	if rel == ".." {
+		return false, nil
+	}
+	if len(rel) >= 3 && rel[:3] == ".."+string(filepath.Separator) {
+		return false, nil
+	}
+	if filepath.IsAbs(rel) {
+		return false, nil
+	}
+	return true, nil
+}
+
 func canonicalPath(path string) (string, error) {
 	abs, err := filepath.Abs(path)
 	if err != nil {

internal/mcp/handler_parse.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"path/filepath"
 	"slices"
-	"strings"
 	"time"
 
 	"github.com/mark3labs/mcp-go/mcp"
@@ -488,22 +487,19 @@ func (h *handlers) validateAnalysisPath(path string) (string, error) {
 	if path == "" {
 		return "", fmt.Errorf("path is required")
 	}
-	allowed := h.deps.RepoRoot
-	if allowed == "" {
-		allowed = h.workspaceRoot()
-	}
-	if allowed == "" {
+	allowedRoots := configuredAnalysisRoots(h.deps.RepoRoot, h.workspaceRoot())
+	if len(allowedRoots) == 0 {
 		return "", fmt.Errorf("analysis root is not configured")
 	}
 	target, err := canonicalExistingPath(path)
 	if err != nil {
 		return "", fmt.Errorf("invalid path: %w", err)
 	}
-	base, err := canonicalPath(allowed)
+	allowed, err := validatePathWithinAllowedRoots(target, allowedRoots)
 	if err != nil {
 		return "", fmt.Errorf("invalid configured analysis root: %w", err)
 	}
-	if target != base && !strings.HasPrefix(target, base+string(os.PathSeparator)) {
+	if !allowed {
 		return "", fmt.Errorf("path %q is outside configured analysis root", path)
 	}
 	return target, nil

internal/mcp/handlers_test.go

@@ -94,6 +94,24 @@ func Hello() {}
 	}
 }
 
+func TestParseProject_AllowsWorkspacePathWhenRepoRootIsAlsoConfigured(t *testing.T) {
+	deps := setupTestDeps(t)
+	deps.RepoRoot = t.TempDir()
+	deps.WorkspaceRoot = t.TempDir()
+	workspaceDir := filepath.Join(deps.WorkspaceRoot, "sample-ws")
+	if err := os.MkdirAll(workspaceDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	writeGoFile(t, workspaceDir, "main.go", `package main
+func Hello() {}
+`)
+
+	result := callTool(t, deps, "parse_project", map[string]any{"path": workspaceDir, "workspace": "sample-ws"})
+	if result.IsError {
+		t.Fatalf("expected workspace path to be allowed, got error: %s", getTextContent(result))
+	}
+}
+
 func TestParseProject_FailsClosedWithoutConfiguredRoot(t *testing.T) {
 	deps := setupTestDeps(t)
 	deps.RepoRoot = ""

internal/mcp/prompts_test.go

@@ -626,6 +626,24 @@ func TestPreMergeCheck_RejectsRepoRootOutsideConfiguredRoot(t *testing.T) {
 	}
 }
 
+func TestReviewChanges_AllowsWorkspaceRootWhenRepoRootAlsoConfigured(t *testing.T) {
+	deps, _ := setupPromptTestDeps(t)
+	deps.ChangesGitClient = &mockGitClient{changedFiles: []string{}}
+	deps.RepoRoot = t.TempDir()
+	deps.WorkspaceRoot = t.TempDir()
+	workspaceRoot := t.TempDir()
+	deps.WorkspaceRoot = workspaceRoot
+
+	resultJSON := callPrompt(t, deps, "review_changes", map[string]string{
+		"repo_root": workspaceRoot,
+		"base":      "HEAD~1",
+	})
+	text := getPromptText(t, resultJSON)
+	if !strings.Contains(text, "변경사항이 없습니다") {
+		t.Fatalf("expected workspace-root repo_root to be accepted, got: %s", text)
+	}
+}
+
 // ============================================================
 // Mock types
 // ============================================================