fix: accept bare hosts in SanitizeNullifyHost and update generator (#130)

SanitizeNullifyHost now accepts bare hosts (e.g. acme.nullify.ai)
in addition to api-prefixed hosts. The code generator template is
updated to include the apiHost prefix logic so regeneration preserves
the behavior. User-facing messages updated accordingly.

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: tim-thacker-nullify

cmd/cli/cmd/auth.go

@@ -45,13 +45,13 @@ var loginCmd = &cobra.Command{
 
 		// If still no host, prompt
 		if loginHost == "" {
-			fmt.Print("Enter your Nullify instance (e.g., api.acme.nullify.ai): ")
+			fmt.Print("Enter your Nullify instance (e.g., acme.nullify.ai): ")
 			_, _ = fmt.Scanln(&loginHost)
 		}
 
 		sanitizedHost, err := lib.SanitizeNullifyHost(loginHost)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error: invalid host %q - must be in the format api.<your-instance>.nullify.ai\n", loginHost)
+			fmt.Fprintf(os.Stderr, "Error: invalid host %q - must be in the format <your-instance>.nullify.ai\n", loginHost)
 			os.Exit(1)
 		}
 
@@ -90,12 +90,12 @@ var statusCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		cfg, err := auth.LoadConfig()
 		if err != nil {
-			fmt.Println("Not configured. Run 'nullify auth login --host api.<your-instance>.nullify.ai' to get started.")
+			fmt.Println("Not configured. Run 'nullify auth login --host <your-instance>.nullify.ai' to get started.")
 			return
 		}
 
 		if cfg.Host == "" {
-			fmt.Println("No host configured. Run 'nullify auth login --host api.<your-instance>.nullify.ai'")
+			fmt.Println("No host configured. Run 'nullify auth login --host <your-instance>.nullify.ai'")
 			return
 		}
 
@@ -160,7 +160,7 @@ var switchCmd = &cobra.Command{
 			// List available hosts
 			creds, err := auth.LoadCredentials()
 			if err != nil || len(creds) == 0 {
-				fmt.Println("No configured hosts. Run 'nullify auth login --host api.<your-instance>.nullify.ai'")
+				fmt.Println("No configured hosts. Run 'nullify auth login --host <your-instance>.nullify.ai'")
 				return
 			}
 

cmd/cli/cmd/root.go

@@ -42,7 +42,7 @@ func Execute() error {
 }
 
 func init() {
-	rootCmd.PersistentFlags().StringVar(&host, "host", "", "The base URL of your Nullify API instance (e.g., api.acme.nullify.ai)")
+	rootCmd.PersistentFlags().StringVar(&host, "host", "", "The base URL of your Nullify API instance (e.g., acme.nullify.ai)")
 	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Enable verbose logging")
 	rootCmd.PersistentFlags().BoolVarP(&debug, "debug", "d", false, "Enable debug logging")
 	rootCmd.PersistentFlags().StringVarP(&outputFmt, "output", "o", "json", "Output format (json, table, yaml)")
@@ -124,7 +124,7 @@ func resolveHost(ctx context.Context) string {
 		sanitized, err := lib.SanitizeNullifyHost(host)
 		if err != nil {
 			logger.L(ctx).Error(
-				"invalid host, must be in the format api.<your-instance>.nullify.ai",
+				"invalid host, must be in the format <your-instance>.nullify.ai",
 				logger.String("host", host),
 			)
 			os.Exit(1)
@@ -146,7 +146,7 @@ func resolveHost(ctx context.Context) string {
 		}
 	}
 
-	logger.L(ctx).Error("no host configured. Run 'nullify auth login --host api.<your-instance>.nullify.ai' to configure.")
+	logger.L(ctx).Error("no host configured. Run 'nullify auth login --host <your-instance>.nullify.ai' to configure.")
 	os.Exit(1)
 	return ""
 }

internal/lib/urls.go

@@ -50,8 +50,8 @@ func SanitizeNullifyHost(nullifyHost string) (string, error) {
 		return "", err
 	}
 
-	if !strings.HasPrefix(nullifyURL.Host, "api.") || !strings.HasSuffix(nullifyURL.Host, ".nullify.ai") {
-		return "", errors.New("invalid host, must be in the format api.<your-instance>.nullify.ai")
+	if !strings.HasSuffix(nullifyURL.Host, ".nullify.ai") {
+		return "", errors.New("invalid host, must be in the format <your-instance>.nullify.ai")
 	}
 
 	return nullifyURL.Host, nil

internal/lib/urls_test.go

@@ -83,6 +83,18 @@ func TestSanitizeNullifyHost(t *testing.T) {
 			expectedHost: "api.example.nullify.ai",
 			wantErr:      false,
 		},
+		{
+			name:         "bare host without api prefix",
+			inputHost:    "acme.nullify.ai",
+			expectedHost: "acme.nullify.ai",
+			wantErr:      false,
+		},
+		{
+			name:         "bare host with scheme",
+			inputHost:    "https://acme.nullify.ai",
+			expectedHost: "acme.nullify.ai",
+			wantErr:      false,
+		},
 		{
 			name:         "input host with invalid scheme delimiter",
 			inputHost:    "random:/|api.example.nullify.ai",

scripts/generate/main.go

@@ -405,6 +405,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strings"
 )
 
 // Client is a typed HTTP client for the Nullify API.
@@ -417,8 +418,12 @@ type Client struct {
 
 // NewClient creates a new Nullify API client.
 func NewClient(host string, token string, defaultParams map[string]string) *Client {
+	apiHost := host
+	if !strings.HasPrefix(host, "api.") {
+		apiHost = "api." + host
+	}
 	return &Client{
-		BaseURL:       "https://" + host,
+		BaseURL:       "https://" + apiHost,
 		Token:         token,
 		DefaultParams: defaultParams,
 		HTTPClient:    &http.Client{},