psviderski · jabr · Nov 3, 2025 · psviderski · Nov 6, 2025 · psviderski
diff --git a/cmd/uncloud/machine/rename.go b/cmd/uncloud/machine/rename.go
@@ -42,6 +42,20 @@ func rename(ctx context.Context, uncli *cli.CLI, contextName, oldName, newName s
 		return fmt.Errorf("rename machine: %w", err)
 	}
 
+	// Update the machine name in the config file.
+	if uncli.Config != nil {
+		context := uncli.Config.Contexts[uncli.Config.CurrentContext]
+		for i, c := range context.Connections {
+			if c.Name == oldName {
+				context.Connections[i].Name = newName
+				break
+			}
+		}
+		if err := uncli.Config.Save(); err != nil {
+			return fmt.Errorf("save config: %w", err)
+		}
+	}
+
 	fmt.Printf("Machine %q renamed to %q (ID: %s)\n", oldName, machine.Name, machine.Id)
 	return nil
 }
diff --git a/cmd/uncloud/machine/rm.go b/cmd/uncloud/machine/rm.go
@@ -146,6 +146,20 @@ func remove(ctx context.Context, uncli *cli.CLI, nameOrID string, opts removeOpt
 	}
 	fmt.Printf("Machine '%s' removed from the cluster.\n", m.Name)
 
+	// Remove the connection to the machine from the uncloud config if it exists.
+	if uncli.Config != nil {
+		context := uncli.Config.Contexts[uncli.Config.CurrentContext]
+		for i, c := range context.Connections {
+			if c.Name == m.Name {
+				context.Connections = slices.Delete(context.Connections, i, i+1)
+				break
+			}
+		}
+		if err := uncli.Config.Save(); err != nil {
+			return fmt.Errorf("save config: %w", err)
+		}
+	}
+
 	if reset && reachable {
 		_, err = client.MachineClient.Reset(mctx, &pb.ResetRequest{})
 		if err != nil {
@@ -155,9 +169,6 @@ func remove(ctx context.Context, uncli *cli.CLI, nameOrID string, opts removeOpt
 		}
 	}
 
-	// TODO: remove the connection to the machine from the uncloud config if it exists. We need a way to associate
-	//  the machine with its connection in the config, e.g. by storing the machine name in the connection metadata.
-
 	// TODO: If Caddy was running on this machine and a cluster domain is reserved,
 	//  let the user know that the DNS records should be updated.
 

diff --git a/cmd/uncloud/main.go b/cmd/uncloud/main.go
@@ -40,6 +40,7 @@ func main() {
 			cli.BindEnvToFlag(cmd, "connect", "UNCLOUD_CONNECT")
 			cli.BindEnvToFlag(cmd, "uncloud-config", "UNCLOUD_CONFIG")
 
+			configPath := fs.ExpandHomeDir(opts.configPath)
 			var conn *config.MachineConnection
 			if opts.connect != "" {
 				if strings.HasPrefix(opts.connect, "tcp://") {
@@ -55,18 +56,34 @@ func main() {
 					conn = &config.MachineConnection{
 						SSHCLI: config.SSHDestination(dest),
 					}
-				} else {
-					dest := opts.connect
-					if strings.HasPrefix(dest, "ssh://") {
-						dest = dest[len("ssh://"):]
-					}
+				} else if strings.HasPrefix(opts.connect, "ssh://") {
+					dest := opts.connect[len("ssh://"):]
 					conn = &config.MachineConnection{
 						SSH: config.SSHDestination(dest),
 					}
+				} else {
+					// If the connect string doesn't contain "@", it could be a machine name.
+					if !strings.Contains(opts.connect, "@") {
+						cfg, err := config.NewFromFile(configPath)
+						if err == nil {
+							for _, c := range cfg.Contexts[cfg.CurrentContext].Connections {
+								if c.Name == opts.connect {
+									conn = &c
+									break
+								}
+							}
+						}
+					}
+
+					// Default to assuming it is an ssh destination.
+					if conn == nil {
+						conn = &config.MachineConnection{
+							SSH: config.SSHDestination(opts.connect),
+						}
+					}
 				}
 			}
 
-			configPath := fs.ExpandHomeDir(opts.configPath)
 			uncli, err := cli.New(configPath, conn)
 			if err != nil {
 				return fmt.Errorf("initialise CLI: %w", err)

diff --git a/internal/cli/cli.go b/internal/cli/cli.go
@@ -398,6 +398,7 @@ func (cli *CLI) AddMachine(ctx context.Context, opts AddMachineOptions) (*client
 	connCfg := config.MachineConnection{
 		SSH:        config.NewSSHDestination(opts.RemoteMachine.User, opts.RemoteMachine.Host, opts.RemoteMachine.Port),
 		SSHKeyFile: opts.RemoteMachine.KeyPath,
+		Name:       opts.MachineName,
 	}
 	if contextName == "" {
 		contextName = cli.Config.CurrentContext

diff --git a/internal/cli/config/connection.go b/internal/cli/config/connection.go
@@ -25,16 +25,30 @@ type MachineConnection struct {
 	TCP       *netip.AddrPort `yaml:"tcp,omitempty"`
 	Host      string          `yaml:"host,omitempty"`
 	PublicKey secret.Secret   `yaml:"public_key,omitempty"`
+	Name      string          `yaml:"name,omitempty"`
 }
 
 func (c MachineConnection) String() string {
+	var connStr string
 	if c.SSH != "" {
-		return "ssh://" + string(c.SSH)
+		connStr = "ssh://" + string(c.SSH)
 	} else if c.SSHCLI != "" {
-		return "ssh+cli://" + string(c.SSHCLI)
+		connStr = "ssh+cli://" + string(c.SSHCLI)
 	} else if c.TCP != nil && c.TCP.IsValid() {
-		return fmt.Sprintf("tcp://%s", c.TCP)
+		connStr = fmt.Sprintf("tcp://%s", c.TCP)
 	}
+
+	if c.Name != "" {
+		if connStr != "" {
+			return fmt.Sprintf("%s (%s)", c.Name, connStr)
+		}
+		return c.Name
+	}
+
+	if connStr != "" {
+		return connStr
+	}
+
 	return "unknown connection"
 }