Improve interactive tunnel add UX and fix multiple issues

- Remove DNS resolution section from diagnostics screen
- Fix VayDNS record type not exported in client config URI
- Show defaults in brackets for all tunnel add prompts (MTU, idle timeout, keep alive, client ID size, queue size, port)
- Mark default record type in VayDNS select menus across all wizards
- Skip WARP prompt on re-run when already enabled

Author: anonvector

internal/clientcfg/generate.go

@@ -78,6 +78,9 @@ func GenerateURI(tunnel *config.TunnelConfig, backend *config.BackendConfig, cfg
 	case config.TransportVayDNS:
 		if tunnel.VayDNS != nil {
 			fields[FPublicKey] = tunnel.VayDNS.PublicKey
+			if tunnel.VayDNS.RecordType != "" {
+				fields[FDNSTransport] = tunnel.VayDNS.RecordType
+			}
 		}
 
 	case config.TransportSlipstream:

internal/handlers/quick_wizard.go

@@ -118,7 +118,11 @@ func handleQuickWizard(ctx *actions.Context) error {
 		if tr == config.TransportVayDNS {
 			rtOpts := make([]actions.SelectOption, len(config.ValidVayDNSRecordTypes))
 			for i, rt := range config.ValidVayDNSRecordTypes {
-				rtOpts[i] = actions.SelectOption{Value: rt, Label: rt}
+				label := rt
+				if i == 0 {
+					label = rt + " (default)"
+				}
+				rtOpts[i] = actions.SelectOption{Value: rt, Label: label}
 			}
 			recordType, err = prompt.Select("DNS record type", rtOpts)
 			if err != nil {

internal/handlers/system_diag.go

@@ -208,44 +208,6 @@ func handleSystemDiag(ctx *actions.Context) error {
 		}
 	}
 
-	// ── DNS Resolution ──────────────────────────────────────
-	domainsChecked := false
-	for _, t := range cfg.Tunnels {
-		if t.Domain == "" || t.IsDirectTransport() {
-			continue
-		}
-		if !domainsChecked {
-			out.Print("")
-			out.Print("  DNS Resolution")
-			out.Print("  ──────────────")
-			domainsChecked = true
-		}
-		if t.IsDNSTunnel() {
-			// DNS tunnels use NS records, not A records
-			nss, err := net.LookupNS(t.Domain)
-			if err != nil || len(nss) == 0 {
-				check(fmt.Sprintf("[%s] %s NS", t.Tag, t.Domain), false, "NS record not found")
-			} else {
-				nsHost := nss[0].Host
-				check(fmt.Sprintf("[%s] %s NS", t.Tag, t.Domain), true, nsHost)
-				// Verify the nameserver resolves to an IP
-				addrs, err := net.LookupHost(strings.TrimSuffix(nsHost, "."))
-				if err != nil {
-					check(fmt.Sprintf("[%s] %s A", t.Tag, strings.TrimSuffix(nsHost, ".")), false, "not resolving")
-				} else {
-					check(fmt.Sprintf("[%s] %s A", t.Tag, strings.TrimSuffix(nsHost, ".")), true, strings.Join(addrs, ", "))
-				}
-			}
-		} else {
-			addrs, err := net.LookupHost(t.Domain)
-			if err != nil {
-				check(fmt.Sprintf("[%s] %s", t.Tag, t.Domain), false, "not resolving")
-			} else {
-				check(fmt.Sprintf("[%s] %s", t.Tag, t.Domain), true, strings.Join(addrs, ", "))
-			}
-		}
-	}
-
 	// ── Orphaned Services ───────────────────────────────────
 	allSvc := service.ListSlipgateServices()
 	knownSvc := map[string]bool{

internal/handlers/system_install.go

@@ -273,7 +273,11 @@ func handleSystemInstall(ctx *actions.Context) error {
 		if selectedTransport == config.TransportVayDNS {
 			rtOpts := make([]actions.SelectOption, len(config.ValidVayDNSRecordTypes))
 			for i, rt := range config.ValidVayDNSRecordTypes {
-				rtOpts[i] = actions.SelectOption{Value: rt, Label: rt}
+				label := rt
+				if i == 0 {
+					label = rt + " (default)"
+				}
+				rtOpts[i] = actions.SelectOption{Value: rt, Label: label}
 			}
 			var err error
 			sharedRecordType, err = prompt.Select("DNS record type", rtOpts)
@@ -560,11 +564,17 @@ func handleSystemInstall(ctx *actions.Context) error {
 
 	// ── Step 6b: WARP outbound (default off) ──────────────────────
 	out.Print("")
-	enableWarp, err := prompt.Confirm("Enable WARP outbound (Cloudflare)?")
-	if err != nil {
-		return err
+	enableWarp := cfg.Warp.Enabled
+	if !enableWarp {
+		var err error
+		enableWarp, err = prompt.Confirm("Enable WARP outbound (Cloudflare)?")
+		if err != nil {
+			return err
+		}
+	} else {
+		out.Info("WARP outbound already enabled — skipping")
 	}
-	if enableWarp {
+	if enableWarp && !cfg.Warp.Enabled {
 		out.Info("Setting up Cloudflare WARP...")
 		if err := warp.Setup(cfg, func(msg string) { out.Info(msg) }); err != nil {
 			out.Warning("WARP setup failed: " + err.Error())

internal/handlers/tunnel_add.go

@@ -193,8 +193,17 @@ func addSingleTunnel(ctx *actions.Context, cfg *config.Config, transport_, backe
 			return actions.NewError(actions.TunnelAdd, "key setup failed", err)
 		}
 
+		mtuStr, err := prompt.String("MTU", fmt.Sprintf("%d", config.DefaultMTU))
+		if err != nil {
+			return err
+		}
+		mtu := config.DefaultMTU
+		if n, e := fmt.Sscanf(mtuStr, "%d", &mtu); n != 1 || e != nil {
+			mtu = config.DefaultMTU
+		}
+
 		tunnel.DNSTT = &config.DNSTTConfig{
-			MTU:        config.DefaultMTU,
+			MTU:        mtu,
 			PrivateKey: privKeyPath,
 			PublicKey:  pubKey,
 		}
@@ -254,7 +263,11 @@ func addSingleTunnel(ctx *actions.Context, cfg *config.Config, transport_, backe
 		if recordType == "" {
 			rtOpts := make([]actions.SelectOption, len(config.ValidVayDNSRecordTypes))
 			for i, rt := range config.ValidVayDNSRecordTypes {
-				rtOpts[i] = actions.SelectOption{Value: rt, Label: rt}
+				label := rt
+				if i == 0 {
+					label = rt + " (default)"
+				}
+				rtOpts[i] = actions.SelectOption{Value: rt, Label: label}
 			}
 			var err error
 			recordType, err = prompt.Select("DNS record type", rtOpts)
@@ -263,29 +276,75 @@ func addSingleTunnel(ctx *actions.Context, cfg *config.Config, transport_, backe
 			}
 		}
 
+		mtuStr, err := prompt.String("MTU", fmt.Sprintf("%d", config.DefaultMTU))
+		if err != nil {
+			return err
+		}
+		mtu := config.DefaultMTU
+		if n, e := fmt.Sscanf(mtuStr, "%d", &mtu); n != 1 || e != nil {
+			mtu = config.DefaultMTU
+		}
+
 		vayCfg := &config.VayDNSConfig{
-			MTU:        config.DefaultMTU,
+			MTU:        mtu,
 			PrivateKey: privKeyPath,
 			PublicKey:  pubKey,
 			RecordType: recordType,
 		}
+
 		if v := ctx.GetArg("idle-timeout"); v != "" {
 			vayCfg.IdleTimeout = v
+		} else {
+			v, err := prompt.String("Idle timeout", vayCfg.ResolvedIdleTimeout())
+			if err != nil {
+				return err
+			}
+			if v != "" {
+				vayCfg.IdleTimeout = v
+			}
 		}
+
 		if v := ctx.GetArg("keep-alive"); v != "" {
 			vayCfg.KeepAlive = v
+		} else {
+			v, err := prompt.String("Keep alive", vayCfg.ResolvedKeepAlive())
+			if err != nil {
+				return err
+			}
+			if v != "" {
+				vayCfg.KeepAlive = v
+			}
 		}
+
 		if v := ctx.GetArg("clientid-size"); v != "" {
 			var n int
 			if _, e := fmt.Sscanf(v, "%d", &n); e == nil {
 				vayCfg.ClientIDSize = n
 			}
+		} else {
+			v, err := prompt.String("Client ID size", fmt.Sprintf("%d", vayCfg.ResolvedClientIDSize()))
+			if err != nil {
+				return err
+			}
+			if n, e := fmt.Sscanf(v, "%d", &vayCfg.ClientIDSize); n != 1 || e != nil {
+				vayCfg.ClientIDSize = 0
+			}
 		}
+
 		if v := ctx.GetArg("queue-size"); v != "" {
 			var n int
 			if _, e := fmt.Sscanf(v, "%d", &n); e == nil {
 				vayCfg.QueueSize = n
 			}
+		} else {
+			defQS := 512
+			v, err := prompt.String("Queue size", fmt.Sprintf("%d", defQS))
+			if err != nil {
+				return err
+			}
+			if n, e := fmt.Sscanf(v, "%d", &vayCfg.QueueSize); n != 1 || e != nil {
+				vayCfg.QueueSize = 0
+			}
 		}
 		tunnel.VayDNS = vayCfg
 		out.Success(fmt.Sprintf("Public key: %s", pubKey))
@@ -307,10 +366,19 @@ func addSingleTunnel(ctx *actions.Context, cfg *config.Config, transport_, backe
 				return err
 			}
 		}
+		portStr, err := prompt.String("Port", "443")
+		if err != nil {
+			return err
+		}
+		naivePort := 443
+		if n, e := fmt.Sscanf(portStr, "%d", &naivePort); n != 1 || e != nil {
+			naivePort = 443
+		}
+
 		tunnel.Naive = &config.NaiveConfig{
 			Email:    email,
 			DecoyURL: decoyURL,
-			Port:     443,
+			Port:     naivePort,
 		}
 
 	}