feat(cli): add non-interactive workspace create and mcp-serve --workspace flag (#100)

* feat(cli): add non-interactive workspace create and mcp-serve --workspace flag

Add CLI flags (--name, --backend, --embedder-provider, --embedder-model, --dsn)
to workspace create for scripted/CI usage. Add --workspace flag to mcp-serve
so MCP tools can be scoped to a specific workspace. Add FindWorkspaceConfig()
and WorkspaceStoreConfig() helpers in config package.

* docs: add workspace mode, parallelism tiers, and MCP workspace sections

Update workspace, MCP, embedders, and watch-guide documentation with
workspace mode usage, parallelism tier reference, and MCP workspace-scoped
configuration examples. Add CHANGELOG entry for unreleased changes.

Author: jugrajsingh

.gitignore

@@ -42,3 +42,7 @@ docs/node_modules/
 docs/.astro/
 docs/bun.lock
 __debug*
+
+# Local tooling
+.pre-commit-config.yaml
+docs/plans/

CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- **Non-Interactive Workspace Create**: `workspace create` now supports `--name`, `--backend`, `--embedder-provider`, `--embedder-model`, `--dsn` flags for scripted/CI usage
+  - Enables fully non-interactive workspace creation without TUI prompts
+  - All required parameters can be passed as CLI flags
+- **MCP Serve Workspace Flag**: `mcp-serve --workspace <name>` to scope MCP tools to a specific workspace
+  - MCP search and trace tools automatically use the workspace context
+- **Workspace Config Helpers**: `FindWorkspaceConfig()` and `WorkspaceStoreConfig()` in config package for programmatic workspace resolution
+
+### Documentation
+
+- Updated workspace docs with workspace mode, parallelism tiers, and MCP workspace sections
+- Updated MCP docs with workspace-scoped configuration examples
+- Updated embedders docs with parallelism tier reference
+- Updated watch guide with workspace daemon examples
+
 ## [0.26.0] - 2026-02-01
 
 ### Added
@@ -344,11 +360,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.8.1] - 2026-01-11
 
 ### Documentation
+
 - Simplify Claude Code MCP setup: use `claude mcp add` command instead of manual JSON configuration
 
 ## [0.8.0] - 2026-01-11
 
 ### Added
+
 - **MCP Server Mode**: New `grepai mcp-serve` command for Model Context Protocol integration (#18)
   - Exposes grepai as native MCP tools for AI agents (Claude Code, Cursor, Windsurf, etc.)
   - Available tools: `grepai_search`, `grepai_trace_callers`, `grepai_trace_callees`, `grepai_trace_graph`, `grepai_index_status`
@@ -359,6 +377,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.7.2] - 2026-01-11
 
 ### Documentation
+
 - **Sidebar Reorganization**: Moved "Search Boost" and "Hybrid Search" from Configuration to Features section
 - **Configuration Reference**: Updated full configuration reference with correct field names
   - Added missing options: `version`, `watch.debounce_ms`, `trace.mode`, `trace.enabled_languages`, `trace.exclude_patterns`
@@ -370,6 +389,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.7.1] - 2026-01-11
 
 ### Added
+
 - **Agent Setup Trace Instructions**: Updated `grepai agent-setup` to include trace command documentation (#16)
   - Added "Call Graph Tracing" section with `trace callers`, `trace callees`, `trace graph` examples
   - All trace examples include `--json` flag for optimal AI agent integration
@@ -378,6 +398,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.7.0] - 2026-01-10
 
 ### Added
+
 - **Extended Language Support for Trace**: Symbol extraction now supports additional languages
   - C (`.c`, `.h`) - functions, structs, enums, typedefs
   - Zig (`.zig`) - functions, methods (inside structs/enums), inline/export/extern functions, structs, unions, enums, error sets, opaque types, nested types
@@ -388,6 +409,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.6.0] - 2026-01-10
 
 ### Added
+
 - **Search JSON Output**: New `--json`/`-j` flag for `grepai search` command
   - Machine-readable JSON output optimized for AI agents
   - Excludes internal fields (vector, hash, updated_at) to minimize token usage
@@ -397,6 +419,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.5.0] - 2026-01-10
 
 ### Added
+
 - **Call Graph Tracing**: New `grepai trace` command for code navigation
   - `trace callers <symbol>` - find all functions calling a symbol
   - `trace callees <symbol>` - find all functions called by a symbol
@@ -410,6 +433,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.4.0] - 2026-01-10
 
 ### Added
+
 - **LM Studio Provider**: New local embedding provider using LM Studio
   - Supports OpenAI-compatible API format
   - Configurable endpoint and model selection
@@ -418,6 +442,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.3.0] - 2026-01-09
 
 ### Added
+
 - **Search Boost**: Configurable score multipliers based on file paths
   - Penalize tests, mocks, fixtures, generated files, and docs
   - Boost source directories (`/src/`, `/lib/`, `/app/`)
@@ -431,11 +456,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Feature cards on docs homepage
 
 ### Changed
+
 - Searcher now accepts full SearchConfig instead of just BoostConfig
 
 ## [0.2.0] - 2026-01-09
 
 ### Added
+
 - Initial release of grepai
 - `grepai init` command for project initialization
 - `grepai watch` command for real-time file indexing
@@ -452,12 +479,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Cross-platform support (macOS, Linux, Windows)
 
 ### Security
+
 - Privacy-first design with local embedding option
 - No telemetry or data collection
 
 ## [0.1.0] - 2026-01-09
 
 ### Added
+
 - Initial public release
 
 [Unreleased]: https://github.com/yoanbernabeu/grepai/compare/v0.26.0...HEAD

cli/mcp_serve.go

@@ -2,6 +2,7 @@ package cli
 
 import (
 	"fmt"
+	"os"
 	"path/filepath"
 
 	"github.com/spf13/cobra"
@@ -27,8 +28,13 @@ Arguments:
   project-path  Optional path to the grepai project directory.
                 If not provided, searches for .grepai from current directory.
 
+Flags:
+  --workspace   Workspace name. When set, serves using workspace config from
+                ~/.grepai/workspace.yaml without requiring local .grepai/.
+
 Configuration for Claude Code:
   claude mcp add grepai -- grepai mcp-serve
+  claude mcp add grepai -- grepai mcp-serve --workspace myworkspace
 
 Configuration for Cursor (.cursor/mcp.json):
   {
@@ -54,42 +60,96 @@ Configuration for Cursor with explicit path (recommended for Windows):
 }
 
 func init() {
+	mcpServeCmd.Flags().String("workspace", "", "Workspace name for workspace-only mode (no local .grepai/ required)")
 	rootCmd.AddCommand(mcpServeCmd)
 }
 
-func runMCPServe(_ *cobra.Command, args []string) error {
-	var projectRoot string
-	var err error
+// resolveMCPTarget determines the project root and/or workspace for the MCP server.
+// Returns (projectRoot, workspaceName, error).
+// projectRoot may be empty when in workspace-only mode.
+func resolveMCPTarget(explicitPath, workspaceName string) (string, string, error) {
+	// Priority 1: Explicit --workspace flag
+	if workspaceName != "" {
+		cfg, err := config.LoadWorkspaceConfig()
+		if err != nil {
+			return "", "", fmt.Errorf("failed to load workspace config: %w", err)
+		}
+		if cfg == nil {
+			return "", "", fmt.Errorf("no workspace config found at ~/.grepai/workspace.yaml")
+		}
+		if _, err := cfg.GetWorkspace(workspaceName); err != nil {
+			return "", "", fmt.Errorf("workspace %q not found", workspaceName)
+		}
+
+		// Check if cwd has local config (optional, for trace tools)
+		projectRoot := ""
+		if pr, err := config.FindProjectRoot(); err == nil {
+			projectRoot = pr
+		}
 
-	if len(args) > 0 {
-		// Explicit path provided
-		projectRoot = args[0]
+		return projectRoot, workspaceName, nil
+	}
 
-		// Convert to absolute path if relative
-		if !filepath.IsAbs(projectRoot) {
-			projectRoot, err = filepath.Abs(projectRoot)
+	// Priority 2: Explicit project path argument
+	if explicitPath != "" {
+		if !filepath.IsAbs(explicitPath) {
+			abs, err := filepath.Abs(explicitPath)
 			if err != nil {
-				return fmt.Errorf("failed to resolve path: %w", err)
+				return "", "", fmt.Errorf("failed to resolve path: %w", err)
 			}
+			explicitPath = abs
 		}
-
-		// Validate that it's a grepai project
-		if !config.Exists(projectRoot) {
-			return fmt.Errorf("no grepai project found at %s (run 'grepai init' first)", projectRoot)
-		}
-	} else {
-		// Default behavior (backward compatibility)
-		projectRoot, err = config.FindProjectRoot()
-		if err != nil {
-			return fmt.Errorf("failed to find project root: %w", err)
+		if !config.Exists(explicitPath) {
+			return "", "", fmt.Errorf("no grepai project found at %s (run 'grepai init' first)", explicitPath)
 		}
+		return explicitPath, "", nil
+	}
+
+	// Priority 3: FindProjectRoot (walk upward from cwd)
+	projectRoot, err := config.FindProjectRoot()
+	if err == nil {
+		return projectRoot, "", nil
 	}
 
-	// Create and start MCP server
-	server, err := mcp.NewServer(projectRoot)
+	// Priority 4: Auto-detect workspace from cwd
+	cwd, cwdErr := os.Getwd()
+	if cwdErr != nil {
+		return "", "", fmt.Errorf("failed to find project root: %w", err)
+	}
+
+	wsName, ws, wsErr := config.FindWorkspaceForPath(cwd)
+	if wsErr != nil {
+		return "", "", fmt.Errorf("no grepai project or workspace found (run 'grepai init' or use --workspace)")
+	}
+	if ws != nil {
+		return "", wsName, nil
+	}
+
+	return "", "", fmt.Errorf("no grepai project or workspace found (run 'grepai init' or use --workspace)")
+}
+
+func runMCPServe(cmd *cobra.Command, args []string) error {
+	workspaceFlag, _ := cmd.Flags().GetString("workspace")
+
+	var explicitPath string
+	if len(args) > 0 {
+		explicitPath = args[0]
+	}
+
+	projectRoot, wsName, err := resolveMCPTarget(explicitPath, workspaceFlag)
+	if err != nil {
+		return err
+	}
+
+	var srv *mcp.Server
+	if wsName != "" {
+		srv, err = mcp.NewServerWithWorkspace(projectRoot, wsName)
+	} else {
+		srv, err = mcp.NewServer(projectRoot)
+	}
 	if err != nil {
 		return fmt.Errorf("failed to create MCP server: %w", err)
 	}
 
-	return server.Serve()
+	return srv.Serve()
 }

cli/mcp_serve_test.go

@@ -0,0 +1,83 @@
+package cli
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/yoanbernabeu/grepai/config"
+)
+
+func TestResolveMCPWorkspace(t *testing.T) {
+	t.Run("explicit_workspace_flag", func(t *testing.T) {
+		tmpDir, _ := os.MkdirTemp("", "grepai-mcp-test")
+		defer os.RemoveAll(tmpDir)
+		cleanup := setTestHomeDirCLI(t, tmpDir)
+		defer cleanup()
+
+		cfg := config.DefaultWorkspaceConfig()
+		cfg.AddWorkspace(config.Workspace{
+			Name:  "orbix",
+			Store: config.StoreConfig{Backend: "qdrant"},
+			Embedder: config.EmbedderConfig{
+				Provider: "ollama",
+				Model:    "nomic-embed-text",
+			},
+			Projects: []config.ProjectEntry{
+				{Name: "pipeline", Path: filepath.Join(tmpDir, "pipeline")},
+			},
+		})
+		config.SaveWorkspaceConfig(cfg)
+
+		projectRoot, wsName, err := resolveMCPTarget("", "orbix")
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if wsName != "orbix" {
+			t.Errorf("expected workspace orbix, got %s", wsName)
+		}
+		_ = projectRoot
+	})
+
+	t.Run("explicit_workspace_not_found", func(t *testing.T) {
+		tmpDir, _ := os.MkdirTemp("", "grepai-mcp-test")
+		defer os.RemoveAll(tmpDir)
+		cleanup := setTestHomeDirCLI(t, tmpDir)
+		defer cleanup()
+
+		_, _, err := resolveMCPTarget("", "nonexistent")
+		if err == nil {
+			t.Error("expected error for nonexistent workspace")
+		}
+	})
+
+	t.Run("explicit_project_path", func(t *testing.T) {
+		tmpDir, _ := os.MkdirTemp("", "grepai-mcp-test")
+		defer os.RemoveAll(tmpDir)
+
+		grepaiDir := filepath.Join(tmpDir, ".grepai")
+		os.MkdirAll(grepaiDir, 0755)
+		os.WriteFile(filepath.Join(grepaiDir, "config.yaml"), []byte("version: 1\n"), 0644)
+
+		projectRoot, wsName, err := resolveMCPTarget(tmpDir, "")
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if wsName != "" {
+			t.Errorf("expected empty workspace name, got %s", wsName)
+		}
+		if projectRoot != tmpDir {
+			t.Errorf("expected projectRoot %s, got %s", tmpDir, projectRoot)
+		}
+	})
+
+	t.Run("explicit_project_path_no_config", func(t *testing.T) {
+		tmpDir, _ := os.MkdirTemp("", "grepai-mcp-test")
+		defer os.RemoveAll(tmpDir)
+
+		_, _, err := resolveMCPTarget(tmpDir, "")
+		if err == nil {
+			t.Error("expected error when no .grepai/ at path")
+		}
+	})
+}