Enhance CLI and API functionality with improved namespace handling and context retrieval

Author: tae2089

cmd/ccg/main.go

@@ -61,11 +61,19 @@ func main() {
 	}
 
 	deps.ServeFunc = func(cfg cli.ServeConfig) error {
+		repoRoot := os.Getenv("CCG_REPO_ROOT")
+		if repoRoot == "" {
+			// @domainRule local stdio MCP uses the launch working directory as the analysis boundary when no repo root is configured.
+			if wd, err := os.Getwd(); err == nil {
+				repoRoot = wd
+			}
+		}
 		return mcpruntime.RunStdio(rt, mcpruntime.Options{
 			CacheTTL:            cfg.CacheTTL,
 			NoCache:             cfg.NoCache,
 			OTELEndpoint:        cfg.OTELEndpoint,
 			NamespaceRoot:       cfg.NamespaceRoot,
+			RepoRoot:            repoRoot,
 			MaxFileBytes:        cfg.MaxFileBytes,
 			MaxTotalParsedBytes: cfg.MaxTotalParsedBytes,
 			ServiceVersion:      version,

internal/mcp/handler_docs.go

@@ -269,8 +269,8 @@ func (h *handlers) searchDocs(ctx context.Context, request mcp.CallToolRequest)
 	if err != nil {
 		return finalizeToolResult("", newToolResultErr(err.Error()))
 	}
-	namespace := requestNamespace(request)
-	ctx = h.applyNamespace(ctx, request)
+	namespace := resolveNamespace(ctx, requestNamespace(request))
+	ctx = ctxns.WithNamespace(ctx, namespace)
 	if h.deps.DB == nil {
 		return mcp.NewToolResultError("DB is not configured"), nil
 	}
@@ -373,8 +373,8 @@ func (h *handlers) retrieveDocs(ctx context.Context, request mcp.CallToolRequest
 	}
 	explain := request.GetBool("explain", false)
 
-	namespace := requestNamespace(request)
-	ctx = h.applyNamespace(ctx, request)
+	namespace := resolveNamespace(ctx, requestNamespace(request))
+	ctx = ctxns.WithNamespace(ctx, namespace)
 	if h.deps.DB == nil {
 		return mcp.NewToolResultError("DB is not configured"), nil
 	}

internal/mcp/handler_docs_test.go

@@ -587,6 +587,29 @@ func TestSearchDocs_DBFallbackIsNamespaceIsolated(t *testing.T) {
 	}
 }
 
+func TestSearchDocs_DBFallbackDomainRuleUsesContextNamespace(t *testing.T) {
+	deps := setupTestDeps(t)
+	tmpDir := t.TempDir()
+	deps.NamespaceRoot = filepath.Join(tmpDir, "namespaces")
+	deps.RagIndexDir = filepath.Join(tmpDir, ".ccg")
+	alpha := "alpha-service"
+	beta := "beta-service"
+	seedRetrieveDocsDBFallbackNode(t, deps, alpha, "alpha.Guard", "Guard", "guard.go", model.TagDomainRule, "breakglass alpha approval", "breakglass alpha approval")
+	seedRetrieveDocsDBFallbackNode(t, deps, beta, "beta.Guard", "Guard", "guard.go", model.TagDomainRule, "breakglass beta approval", "breakglass beta approval")
+	rebuildRetrieveDocsSearchBackend(t, deps, alpha)
+	rebuildRetrieveDocsSearchBackend(t, deps, beta)
+
+	result := callToolWithNamespace(t, deps, alpha, "search_docs", map[string]any{"query": "breakglass", "limit": float64(5)})
+	if result.IsError {
+		t.Fatalf("search_docs context namespace DB fallback error: %v", getTextContent(result))
+	}
+
+	results := decodeSearchDocsResults(t, result)
+	if len(results) != 1 || results[0].Summary != "breakglass alpha approval" {
+		t.Fatalf("expected only alpha domainRule result, got %#v", results)
+	}
+}
+
 func TestSearchDocs_DBFallbackAnnotationOnlyMatch(t *testing.T) {
 	deps := setupTestDeps(t)
 	tmpDir := t.TempDir()