feat(shell): add --quiet/-q flag to suppress startup messages

Author: natsirtguy

cmd/mcptools/commands/root.go

@@ -19,6 +19,8 @@ const (
 	FlagTransport      = "--transport"
 	FlagAuthUser       = "--auth-user"
 	FlagAuthHeader     = "--auth-header"
+	FlagQuiet          = "--quiet"
+	FlagQuietShort     = "-q"
 )
 
 // entity types.
@@ -44,6 +46,8 @@ var (
 	AuthUser string
 	// AuthHeader is a custom Authorization header.
 	AuthHeader string
+	// QuietMode suppresses startup messages in shell mode.
+	QuietMode bool
 )
 
 // RootCmd creates the root command.

cmd/mcptools/commands/shell.go

@@ -40,6 +40,9 @@ func ShellCmd() *cobra.Command { //nolint:gocyclo
 				case cmdArgs[i] == FlagServerLogs:
 					ShowServerLogs = true
 					i++
+				case cmdArgs[i] == FlagQuiet || cmdArgs[i] == FlagQuietShort:
+					QuietMode = true
+					i++
 				case cmdArgs[i] == FlagAuthUser && i+1 < len(cmdArgs):
 					AuthUser = cmdArgs[i+1]
 					i += 2
@@ -64,9 +67,11 @@ func ShellCmd() *cobra.Command { //nolint:gocyclo
 				os.Exit(1)
 			}
 
-			fmt.Fprintf(thisCmd.OutOrStdout(), "mcp > MCP Tools Shell (%s)\n", Version)
-			fmt.Fprintf(thisCmd.OutOrStdout(), "mcp > Connected to Server: %s\n", strings.Join(parsedArgs, " "))
-			fmt.Fprintf(thisCmd.OutOrStdout(), "\nmcp > Type '/h' for help or '/q' to quit\n")
+			if !QuietMode {
+				fmt.Fprintf(thisCmd.OutOrStdout(), "mcp > MCP Tools Shell (%s)\n", Version)
+				fmt.Fprintf(thisCmd.OutOrStdout(), "mcp > Connected to Server: %s\n", strings.Join(parsedArgs, " "))
+				fmt.Fprintf(thisCmd.OutOrStdout(), "\nmcp > Type '/h' for help or '/q' to quit\n")
+			}
 
 			line := liner.NewLiner()
 			line.SetCtrlCAborts(true)

cmd/mcptools/commands/shell_test.go

@@ -365,3 +365,85 @@ func TestShellExit(t *testing.T) {
 		})
 	}
 }
+
+
+func TestShellQuietFlag(t *testing.T) {
+	tests := []struct {
+		name           string
+		args           []string
+		expectStartup  bool
+	}{
+		{
+			name:          "without quiet flag shows startup messages",
+			args:          []string{"server"},
+			expectStartup: true,
+		},
+		{
+			name:          "with --quiet flag suppresses startup messages",
+			args:          []string{"--quiet", "server"},
+			expectStartup: false,
+		},
+		{
+			name:          "with -q flag suppresses startup messages",
+			args:          []string{"-q", "server"},
+			expectStartup: false,
+		},
+		{
+			name:          "quiet flag after server arg",
+			args:          []string{"server", "--quiet"},
+			expectStartup: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Reset QuietMode before each test
+			QuietMode = false
+
+			cmd := ShellCmd()
+			buf := new(bytes.Buffer)
+			cmd.SetOut(buf)
+			cmd.SetArgs(tt.args)
+
+			// Create a pipe to simulate stdin
+			r, w, err := os.Pipe()
+			if err != nil {
+				t.Fatalf("Failed to create pipe: %v", err)
+			}
+
+			oldStdin := os.Stdin
+			os.Stdin = r
+			oldStdout := os.Stdout
+			os.Stdout = nil
+
+			go func() {
+				defer w.Close()
+				w.Write([]byte("/q\n"))
+			}()
+
+			cleanupClient := setupMockClient(func(method string, _ any) (map[string]any, error) {
+				return map[string]any{}, nil
+			})
+			defer cleanupClient()
+
+			err = cmd.Execute()
+
+			os.Stdin = oldStdin
+			os.Stdout = oldStdout
+
+			if err != nil {
+				t.Errorf("cmd.Execute() error = %v", err)
+			}
+
+			output := buf.String()
+			hasStartup := strings.Contains(output, "MCP Tools Shell")
+
+			if tt.expectStartup && !hasStartup {
+				t.Errorf("Expected startup messages, but got: %s", output)
+			}
+			if !tt.expectStartup && hasStartup {
+				t.Errorf("Expected no startup messages with quiet flag, but got: %s", output)
+			}
+		})
+	}
+}