Sep 25, 2025 · Sep 24, 2025 · Sep 24, 2025 · Sep 25, 2025 · Sep 25, 2025
diff --git a/cli/ssh.go b/cli/ssh.go
 hostname = strings.TrimSuffix(hostname, qualifiedSuffix)
 }
 hostname = normalizeWorkspaceInput(hostname)
 ws, agent, _, err := GetWorkspaceAndAgent(ctx, inv, client, !disableAutostart, hostname)

 ws, agent, otherAgents, err := GetWorkspaceAndAgent(ctx, inv, client, !disableAutostart, hostname)
 if err != nil && strings.Contains(err.Error(), "multiple agents found") {
 var errorMsg strings.Builder
 _, _ = errorMsg.WriteString(fmt.Sprintf("%s\nTry running:\n", err.Error()))
 for _, agent := range otherAgents {
 switch {
 case config.HostnameSuffix != "":
 _, _ = errorMsg.WriteString(fmt.Sprintf("%s\n", cliui.Code(fmt.Sprintf("$ ssh %s.%s.%s.%s", agent.Name, ws.Name, ws.OwnerName, config.HostnameSuffix))))
 case config.HostnamePrefix != "":
 _, _ = errorMsg.WriteString(fmt.Sprintf("%s\n", cliui.Code(fmt.Sprintf("$ ssh %s%s.%s.%s", config.HostnamePrefix, agent.Name, ws.Name, ws.OwnerName))))
 default:
 _, _ = errorMsg.WriteString(fmt.Sprintf("%s\n", cliui.Code(fmt.Sprintf("$ ssh %s.%s.%s", agent.Name, ws.Name, ws.OwnerName))))
 }
 }
 return ws, agent, xerrors.New(errorMsg.String())
 }
 return ws, agent, err
 }

 }
 workspaceAgent, otherWorkspaceAgents, err := getWorkspaceAgent(workspace, agentName)
 if err != nil {
 returncodersdk.Workspace{}, codersdk.WorkspaceAgent{},nil, err
 returnworkspace, codersdk.WorkspaceAgent{},otherWorkspaceAgents, err
 }

 return workspace, workspaceAgent, otherWorkspaceAgents, nil
 if len(agents) == 1 {
 return agents[0], nil, nil
 }
 return codersdk.WorkspaceAgent{},nil, xerrors.Errorf("multiple agents found, please specify the agent name, available agents: %v", availableNames)
 return codersdk.WorkspaceAgent{},agents, xerrors.Errorf("multiple agents found, please specify the agent name, available agents: %v", availableNames)
 }

 // Attempt to poll workspace autostop. We write a per-workspace lockfile to
Original file line number	Diff line number	Diff line change
Expand Up		@@ -756,7 +756,23 @@ func findWorkspaceAndAgentByHostname(
		hostname = strings.TrimSuffix(hostname, qualifiedSuffix)
		}
		hostname = normalizeWorkspaceInput(hostname)
		ws, agent, _, err := GetWorkspaceAndAgent(ctx, inv, client, !disableAutostart, hostname)

		ws, agent, otherAgents, err := GetWorkspaceAndAgent(ctx, inv, client, !disableAutostart, hostname)
		if err != nil && strings.Contains(err.Error(), "multiple agents found") {
Copy link Member ethanndicksonSep 25, 2025• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Can we define the 'multiple agents found' error as a sentinel, and then use`errors.Is` instead?
		var errorMsg strings.Builder
		_, _ = errorMsg.WriteString(fmt.Sprintf("%s\nTry running:\n", err.Error()))
		for _, agent := range otherAgents {
		switch {
		case config.HostnameSuffix != "":
		_, _ = errorMsg.WriteString(fmt.Sprintf("%s\n", cliui.Code(fmt.Sprintf("$ ssh %s.%s.%s.%s", agent.Name, ws.Name, ws.OwnerName, config.HostnameSuffix))))
		case config.HostnamePrefix != "":
		_, _ = errorMsg.WriteString(fmt.Sprintf("%s\n", cliui.Code(fmt.Sprintf("$ ssh %s%s.%s.%s", config.HostnamePrefix, agent.Name, ws.Name, ws.OwnerName))))
		default:
		_, _ = errorMsg.WriteString(fmt.Sprintf("%s\n", cliui.Code(fmt.Sprintf("$ ssh %s.%s.%s", agent.Name, ws.Name, ws.OwnerName))))
		}
		}
		return ws, agent, xerrors.New(errorMsg.String())
		}
		return ws, agent, err
		}

Expand DownExpand Up		@@ -922,7 +938,7 @@ func GetWorkspaceAndAgent(ctx context.Context, inv serpent.Invocation, client
		}
		workspaceAgent, otherWorkspaceAgents, err := getWorkspaceAgent(workspace, agentName)
		if err != nil {
		returncodersdk.Workspace{}, codersdk.WorkspaceAgent{},nil, err
		returnworkspace, codersdk.WorkspaceAgent{},otherWorkspaceAgents, err
		}

		return workspace, workspaceAgent, otherWorkspaceAgents, nil
Expand DownExpand Up		@@ -958,7 +974,7 @@ func getWorkspaceAgent(workspace codersdk.Workspace, agentName string) (workspac
		if len(agents) == 1 {
		return agents[0], nil, nil
		}
		return codersdk.WorkspaceAgent{},nil, xerrors.Errorf("multiple agents found, please specify the agent name, available agents: %v", availableNames)
		return codersdk.WorkspaceAgent{},agents, xerrors.Errorf("multiple agents found, please specify the agent name, available agents: %v", availableNames)
		}

		// Attempt to poll workspace autostop. We write a per-workspace lockfile to
Expand Down