Fix --dev mode for daemon (#76)

* Clean up --dev mode
* Remove requirement for name in search cmd

Author: peteski22

cmd/daemon.go

@@ -2,15 +2,20 @@ package cmd
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"os"
+	"os/signal"
 	"strings"
+	"syscall"
 
 	"github.com/spf13/cobra"
 
 	"github.com/mozilla-ai/mcpd/v2/internal/cmd"
 	cmdopts "github.com/mozilla-ai/mcpd/v2/internal/cmd/options"
 	"github.com/mozilla-ai/mcpd/v2/internal/config"
 	"github.com/mozilla-ai/mcpd/v2/internal/daemon"
+	"github.com/mozilla-ai/mcpd/v2/internal/flags"
 )
 
 // DaemonCmd should be used to represent the 'daemon' command.
@@ -35,8 +40,8 @@ func NewDaemonCmd(baseCmd *cmd.BaseCmd, opt ...cmdopts.CmdOption) (*cobra.Comman
 
 	cobraCommand := &cobra.Command{
 		Use:   "daemon",
-		Short: "Launches an mcpd daemon instance (Execution Plane)",
-		Long:  c.longDescription(),
+		Short: "Launches an mcpd daemon instance",
+		Long:  "Launches an mcpd daemon instance, which starts MCP servers and provides routing via HTTP API",
 		RunE:  c.run,
 	}
 
@@ -51,55 +56,59 @@ func NewDaemonCmd(baseCmd *cmd.BaseCmd, opt ...cmdopts.CmdOption) (*cobra.Comman
 		&c.Addr,
 		"addr",
 		"localhost:8090",
-		"Specify the address for the daemon to bind (not applicable in --dev mode)",
+		"Address for the daemon to bind (not applicable in --dev mode)",
 	)
 	cobraCommand.MarkFlagsMutuallyExclusive("dev", "addr")
 
 	return cobraCommand, nil
 }
 
-// longDescription returns the long version of the command description.
-func (c *DaemonCmd) longDescription() string {
-	return `Launches an mcpd daemon instance (Execution Plane).
-In dev mode, binds to localhost, logs to console, and exposes local endpoint.
-In prod, binds to 0.0.0.0, logs to stdout, and runs as background service`
-}
-
 // run is configured (via NewDaemonCmd) to be called by the Cobra framework when the command is executed.
 // It may return an error (or nil, when there is no error).
 func (c *DaemonCmd) run(cmd *cobra.Command, args []string) error {
 	// Validate flags.
 	addr := strings.TrimSpace(c.Addr)
 	if err := daemon.IsValidAddr(addr); err != nil {
-		return fmt.Errorf("invalid address flag value: %s: %w", addr, err)
+		return err
 	}
 
-	// TODO: Currently only runs in 'dev' mode... (even without flag)
-	//	addr := "localhost:8080"
-	//	if c.Addr != "" {
-	//		addr = c.Addr
-	//	}
-	//
-	//	c.Logger.Info("Launching daemon (dev mode)", "bindAddr", addr)
-	//	c.Logger.Info("Local endpoint", "url", "http://"+addr+"/api")
-	//	c.Logger.Info("Dev API key", "value", "dev-api-key-12345")   // TODO: Generate local key
-	//	c.Logger.Info("Secrets file", "path", "~/.config/mcpd/secrets.dev.toml") // TODO: Configurable?
-	//	c.Logger.Info("Press Ctrl+C to stop.")
 	logger, err := c.Logger()
 	if err != nil {
 		return err
 	}
 
-	daemonCtx, daemonCtxCancel := context.WithCancel(context.Background())
-	defer daemonCtxCancel()
-
 	d, err := daemon.NewDaemon(logger, c.cfgLoader, addr)
 	if err != nil {
 		return fmt.Errorf("failed to create mcpd daemon instance: %w", err)
 	}
-	if err := d.StartAndManage(daemonCtx); err != nil {
-		return fmt.Errorf("daemon start failed: %w", err)
+
+	// Create the signal handling context for the application.
+	daemonCtx, daemonCtxCancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
+	defer daemonCtxCancel()
+
+	runErr := make(chan error, 1)
+	go func() {
+		if err := d.StartAndManage(daemonCtx); err != nil && !errors.Is(err, context.Canceled) {
+			runErr <- err
+		}
+	}()
+
+	// Print --dev mode banner if required.
+	if c.Dev {
+		logger.Info("Launching daemon in dev mode", "addr", addr)
+		fmt.Printf("mcpd daemon running in 'dev' mode.\n\n"+
+			"  Local API:\thttp://%s/api/v1\n"+
+			"  OpenAPI UI:\thttp://%s/docs\n"+
+			"  Config file:\t%s\n"+
+			"  Secrets file:\t%s\n\n"+
+			"Press Ctrl+C to stop.\n\n", addr, addr, flags.ConfigFile, flags.RuntimeFile)
 	}
 
-	return nil
+	select {
+	case <-daemonCtx.Done():
+		return nil // Graceful Ctrl+C / SIGTERM
+	case err := <-runErr:
+		logger.Error("error running daemon instance", "error", err)
+		return err // Propagate daemon failure
+	}
 }

cmd/search.go

@@ -44,10 +44,12 @@ func NewSearchCmd(baseCmd *cmd.BaseCmd, opt ...cmdopts.CmdOption) (*cobra.Comman
 	}
 
 	cobraCommand := &cobra.Command{
-		Use:   "search <server-name>",
+		Use:   "search [server-name]",
 		Short: "Searches all configured registries for matching MCP servers",
-		Long:  c.longDescription(),
-		RunE:  c.run,
+		Long: fmt.Sprintf("Searches all configured registries for matching MCP servers, "+
+			"the wildcard '%s' is the default when name is not specified. "+
+			"Returns aggregated results from all configured registries", options.WildcardCharacter),
+		RunE: c.run,
 	}
 
 	cobraCommand.Flags().StringVar(
@@ -102,11 +104,6 @@ func NewSearchCmd(baseCmd *cmd.BaseCmd, opt ...cmdopts.CmdOption) (*cobra.Comman
 	return cobraCommand, nil
 }
 
-// longDescription returns the long version of the command description.
-func (c *SearchCmd) longDescription() string {
-	return `Searches all configured registries for matching MCP servers. Returns aggregated results for matches`
-}
-
 func (c *SearchCmd) filters() map[string]string {
 	f := make(map[string]string)
 
@@ -133,12 +130,10 @@ func (c *SearchCmd) filters() map[string]string {
 }
 
 func (c *SearchCmd) run(cmd *cobra.Command, args []string) error {
-	if len(args) == 0 || strings.TrimSpace(args[0]) == "" {
-		return fmt.Errorf("name is required and cannot be empty")
-	}
-	name := strings.TrimSpace(args[0])
-	if name == "" {
-		return fmt.Errorf("name cannot be empty")
+	// Name not required, default to the wildcard.
+	name := options.WildcardCharacter
+	if len(args) > 0 && strings.TrimSpace(args[0]) != "" {
+		name = strings.TrimSpace(args[0])
 	}
 
 	reg, err := c.registryBuilder.Build()

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
 	github.com/stretchr/testify v1.10.0
+	golang.org/x/sync v0.16.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 

go.sum

@@ -30,8 +30,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mark3labs/mcp-go v0.32.0 h1:fgwmbfL2gbd67obg57OfV2Dnrhs1HtSdlY/i5fn7MU8=
-github.com/mark3labs/mcp-go v0.32.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
 github.com/mark3labs/mcp-go v0.33.0 h1:naxhjnTIs/tyPZmWUZFuG0lDmdA6sUyYGGf3gsHvTCc=
 github.com/mark3labs/mcp-go v0.33.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -60,6 +58,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
 github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=