Shutdown handling tweak (#77)

* Shutdown handling tweak
* Close channel for receiving errors from daemon
* Tweak logging/make sure we log everything before we close out
* Fix formatting error in msg for tools remove

Author: peteski22

cmd/config/tools/remove.go

@@ -92,7 +92,7 @@ func (c *RemoveCmd) run(cmd *cobra.Command, args []string) error {
 			msg = fmt.Sprintf("✓ Tools removed for server '%s': %v\n", serverName, slices.Collect(maps.Keys(removed)))
 		}
 
-		_, err = fmt.Fprintf(cmd.OutOrStdout(), msg)
+		_, err = fmt.Fprint(cmd.OutOrStdout(), msg)
 		if err != nil {
 			return err
 		}

cmd/daemon.go

@@ -91,6 +91,7 @@ func (c *DaemonCmd) run(cmd *cobra.Command, args []string) error {
 		if err := d.StartAndManage(daemonCtx); err != nil && !errors.Is(err, context.Canceled) {
 			runErr <- err
 		}
+		close(runErr)
 	}()
 
 	// Print --dev mode banner if required.
@@ -106,9 +107,11 @@ func (c *DaemonCmd) run(cmd *cobra.Command, args []string) error {
 
 	select {
 	case <-daemonCtx.Done():
-		return nil // Graceful Ctrl+C / SIGTERM
+		logger.Info("Shutting down daemon")
+		err := <-runErr // Wait for cleanup and deferred logging.
+		return err      // Graceful Ctrl+C / SIGTERM.
 	case err := <-runErr:
 		logger.Error("error running daemon instance", "error", err)
-		return err // Propagate daemon failure
+		return err // Propagate daemon failure.
 	}
 }

internal/daemon/daemon.go

@@ -81,7 +81,7 @@ func NewDaemon(logger hclog.Logger, cfgLoader config.Loader, apiAddr string) (*D
 func (d *Daemon) StartAndManage(ctx context.Context) error {
 	// Handle clean-up.
 	defer func() {
-		d.logger.Info("Closing MCP server connections")
+		d.logger.Info("Shutting down MCP servers and client connections")
 		for _, n := range d.clientManager.List() {
 			if c, ok := d.clientManager.Client(n); ok {
 				_ = c.Close()
@@ -149,8 +149,8 @@ func (d *Daemon) startMCPServer(ctx context.Context, server runtime.Server) erro
 	}
 	args = append([]string{packageNameAndVersion}, server.Args...)
 
-	logger.Info(
-		"attempting to start MCP server",
+	logger.Debug(
+		"attempting to start server",
 		"binary", runtimeBinary,
 		"args", args,
 		"environment", env,
@@ -161,7 +161,7 @@ func (d *Daemon) startMCPServer(ctx context.Context, server runtime.Server) erro
 		return fmt.Errorf("error starting MCP server: '%s': %w", server.Name, err)
 	}
 
-	logger.Info(fmt.Sprintf("MCP server started"))
+	logger.Info("Started")
 
 	// Get stderr reader
 	stderr, ok := client.GetStderr(stdioClient)
@@ -209,12 +209,12 @@ func (d *Daemon) startMCPServer(ctx context.Context, server runtime.Server) erro
 	}
 
 	packageNameAndVersion = fmt.Sprintf("%s@%s", initResult.ServerInfo.Name, initResult.ServerInfo.Version)
-	logger.Info(fmt.Sprintf("Initialized MCP server: '%s'", packageNameAndVersion))
+	logger.Info(fmt.Sprintf("Initialized: '%s'", packageNameAndVersion))
 
 	// Store the client.
 	d.clientManager.Add(server.Name, stdioClient, server.Tools)
 
-	logger.Info("Ready")
+	logger.Info("Ready!")
 
 	return nil
 }