changed some stuff

Author: darkcoderrises

.gitignore

@@ -4,8 +4,6 @@
 /dgraph-bulk-loader
 /osx-docker-gopath
 
-/mcp/dgraph-mcp/dgraph-mcp
-
 # goland project folder
 .idea
 dgraph.iml

dgraph/cmd/alpha/run.go

@@ -476,18 +476,18 @@ func serveGRPC(l net.Listener, tlsCfg *tls.Config, closer *z.Closer) {
 	s.Stop()
 }
 
-func setupMcp(baseMux *http.ServeMux, connectionString, readOnly string) error {
+func setupMcp(baseMux *http.ServeMux, connectionString, url string, readOnly bool) error {
 	s, err := dgraphmcp.NewMCPServer(connectionString, readOnly)
 	if err != nil {
 		glog.Errorf("Failed to initialize MCPServer: %v", err)
 		return err
 	}
 
 	sse := server.NewSSEServer(s,
-		server.WithBasePath("/mcp"),
+		server.WithBasePath(url),
 	)
-	baseMux.HandleFunc("/mcp", sse.ServeHTTP)
-	baseMux.HandleFunc("/mcp/", sse.ServeHTTP)
+	baseMux.HandleFunc(url, sse.ServeHTTP)
+	baseMux.HandleFunc(url+"/", sse.ServeHTTP)
 	return nil
 }
 
@@ -600,7 +600,10 @@ func setupServer(closer *z.Closer, enableMcp bool) {
 	go serveGRPC(grpcListener, tlsCfg, x.ServerCloser)
 
 	if enableMcp {
-		if err := setupMcp(baseMux, buildConnectionString(laddr, grpcPort()), "true"); err != nil {
+		if err := setupMcp(baseMux, buildConnectionString(laddr, grpcPort()), "/mcp", false); err != nil {
+			log.Fatal(err)
+		}
+		if err := setupMcp(baseMux, buildConnectionString(laddr, grpcPort()), "/mcp-ro", true); err != nil {
 			log.Fatal(err)
 		}
 	}

dgraph/cmd/mcp/run.go

@@ -0,0 +1,57 @@
+/*
+ * SPDX-FileCopyrightText: © Hypermode Inc. <[email protected]>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package mcp
+
+import (
+	"github.com/golang/glog"
+	"github.com/mark3labs/mcp-go/server"
+	"github.com/spf13/cobra"
+
+	"github.com/hypermodeinc/dgraph/v25/mcp"
+	"github.com/hypermodeinc/dgraph/v25/x"
+)
+
+var (
+	Mcp x.SubCommand
+)
+
+func init() {
+	Mcp.Cmd = &cobra.Command{
+		Use:   "mcp",
+		Short: "Run Dgraph MCP server",
+		Long: `
+A Dgraph MCP server is a long running process that provides an STDIO interface for running mcp
+`,
+		Run: func(cmd *cobra.Command, args []string) {
+			defer x.StartProfile(Mcp.Conf).Stop()
+			run()
+		},
+		Annotations: map[string]string{"group": "core"},
+	}
+	Mcp.EnvPrefix = "DGRAPH_MCP"
+	Mcp.Cmd.SetHelpTemplate(x.NonRootTemplate)
+
+	flag := Mcp.Cmd.Flags()
+
+	flag.StringP("connection", "c", "dgraph://localhost:9080", "Dgraph connection string.")
+	flag.Bool("read-only", false, "Run MCP server in read-only mode.")
+}
+
+func run() {
+	connectionString := Mcp.Conf.GetString("connection")
+	readOnly := Mcp.Conf.GetBool("read_only")
+
+	s, err := mcp.NewMCPServer(connectionString, readOnly)
+	if err != nil {
+		glog.Errorf("Failed to initialize MCPServer: %v", err)
+		return
+	}
+
+	// Start the stdio server
+	if err := server.ServeStdio(s); err != nil {
+		glog.Errorf("Server error: %v", err)
+	}
+}

dgraph/cmd/root.go

@@ -34,6 +34,7 @@ import (
 	"github.com/hypermodeinc/dgraph/v25/dgraph/cmd/decrypt"
 	"github.com/hypermodeinc/dgraph/v25/dgraph/cmd/increment"
 	"github.com/hypermodeinc/dgraph/v25/dgraph/cmd/live"
+	"github.com/hypermodeinc/dgraph/v25/dgraph/cmd/mcp"
 	"github.com/hypermodeinc/dgraph/v25/dgraph/cmd/migrate"
 	"github.com/hypermodeinc/dgraph/v25/dgraph/cmd/version"
 	"github.com/hypermodeinc/dgraph/v25/dgraph/cmd/zero"
@@ -78,7 +79,7 @@ var subcommands = []*x.SubCommand{
 	&bulk.Bulk, &cert.Cert, &conv.Conv, &live.Live, &alpha.Alpha, &zero.Zero, &version.Version,
 	&debug.Debug, &migrate.Migrate, &debuginfo.DebugInfo, &upgrade.Upgrade, &decrypt.Decrypt, &increment.Increment,
 	&checkupgrade.CheckUpgrade, &backup.Restore, &backup.LsBackup, &backup.ExportBackup, &acl.CmdAcl,
-	&audit.CmdAudit,
+	&audit.CmdAudit, &mcp.Mcp,
 }
 
 func initCmds() {

mcp/dgraph-mcp/main.go

@@ -3,7 +3,6 @@ package mcp
 import (
 	"context"
 	"fmt"
-	"os"
 	"time"
 
 	"github.com/dgraph-io/dgo/v250"
@@ -39,7 +38,7 @@ func getConn(connectionString string) (*dgo.Dgraph, error) {
 }
 
 // NewMCPServer initializes and returns a new MCPServer instance.
-func NewMCPServer(connectionString, readOnly string) (*server.MCPServer, error) {
+func NewMCPServer(connectionString string, readOnly bool) (*server.MCPServer, error) {
 	s := server.NewMCPServer(
 		"Dgraph MCP Server",
 		"1.0.0",
@@ -72,7 +71,7 @@ func NewMCPServer(connectionString, readOnly string) (*server.MCPServer, error)
 		}),
 	)
 
-	if readOnly != "true" {
+	if !readOnly {
 		alterSchemaTool := mcp.NewTool("Alter-Schema",
 			mcp.WithDescription("Alter Dgraph DQL Schema in dgraph db"),
 			mcp.WithString("schema",
@@ -303,30 +302,5 @@ func NewMCPServer(connectionString, readOnly string) (*server.MCPServer, error)
 		}, nil
 	})
 
-	addPrompt(s)
-
 	return s, nil
 }
-
-func addPrompt(s *server.MCPServer) {
-	promptFilePath := "./prompt.txt"
-	promptBytes, err := os.ReadFile(promptFilePath)
-	if err != nil {
-		glog.Errorf("failed to read prompt file: %v", err)
-		return
-	}
-	prompt := string(promptBytes)
-	s.AddPrompt(mcp.NewPrompt("Quick start prompt",
-		mcp.WithPromptDescription("A quick Start prompt for new users and llms"),
-	), func(ctx context.Context, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
-		return mcp.NewGetPromptResult(
-			"A quick start prompt",
-			[]mcp.PromptMessage{
-				mcp.NewPromptMessage(
-					mcp.RoleAssistant,
-					mcp.NewTextContent(prompt),
-				),
-			},
-		), nil
-	})
-}