Jun 19, 2025 · Jun 18, 2025 · Jun 18, 2025 · Jun 19, 2025 · Jun 19, 2025
diff --git a/cli/ssh.go b/cli/ssh.go
 func getWorkspaceAgent(workspace codersdk.Workspace, agentName string) (workspaceAgent codersdk.WorkspaceAgent, err error) {
 resources := workspace.LatestBuild.Resources

 agents := make([]codersdk.WorkspaceAgent, 0)
 var (
 availableNames []string
 agents         []codersdk.WorkspaceAgent
 subAgents      []codersdk.WorkspaceAgent
 )
 for _, resource := range resources {
 agents = append(agents, resource.Agents...)
 for _, agent := range resource.Agents {
 availableNames = append(availableNames, agent.Name)
 if agent.ParentID.UUID == uuid.Nil {
 agents = append(agents, agent)
 } else {
 subAgents = append(subAgents, agent)
 }
 }
 }
 if len(agents) == 0 {
 return codersdk.WorkspaceAgent{}, xerrors.Errorf("workspace %q has no agents", workspace.Name)
 }
 slices.Sort(availableNames)
 if agentName != "" {
 agents = append(agents, subAgents...)
 for _, otherAgent := range agents {
 if otherAgent.Name != agentName {
 continue
 }
 workspaceAgent = otherAgent
 break
 }
 if workspaceAgent.ID == uuid.Nil {
 return codersdk.WorkspaceAgent{}, xerrors.Errorf("agent not found by name %q", agentName)
 return otherAgent, nil
 }
 return codersdk.WorkspaceAgent{}, xerrors.Errorf("agent not found by name %q, available agents: %v", agentName, availableNames)
 }
 if workspaceAgent.ID == uuid.Nil {
 if len(agents) > 1 {
 workspaceAgent, err = cryptorand.Element(agents)
 if err != nil {
 return codersdk.WorkspaceAgent{}, err
 }
 } else {
 workspaceAgent = agents[0]
 }
 if len(subAgents) == 1 {
 return subAgents[0], nil
 } else if len(subAgents) > 1 {
 return codersdk.WorkspaceAgent{}, xerrors.Errorf("multiple sub-agents found, please specify the agent name, available agents: %v", availableNames)
 }
 if len(agents) == 1 {
 return agents[0], nil
 }
 returnworkspaceAgent, nil
 returncodersdk.WorkspaceAgent{}, 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		@@ -925,36 +925,44 @@ func getWorkspaceAndAgent(ctx context.Context, inv serpent.Invocation, client
		func getWorkspaceAgent(workspace codersdk.Workspace, agentName string) (workspaceAgent codersdk.WorkspaceAgent, err error) {
		resources := workspace.LatestBuild.Resources

		agents := make([]codersdk.WorkspaceAgent, 0)
		var (
		availableNames []string
		agents []codersdk.WorkspaceAgent
		subAgents []codersdk.WorkspaceAgent
		)
		for _, resource := range resources {
		agents = append(agents, resource.Agents...)
		for _, agent := range resource.Agents {
		availableNames = append(availableNames, agent.Name)
		if agent.ParentID.UUID == uuid.Nil {
		agents = append(agents, agent)
		} else {
		subAgents = append(subAgents, agent)
		}
		}
		}
		if len(agents) == 0 {
		return codersdk.WorkspaceAgent{}, xerrors.Errorf("workspace %q has no agents", workspace.Name)
		}
		slices.Sort(availableNames)
		if agentName != "" {
		agents = append(agents, subAgents...)
		for _, otherAgent := range agents {
		if otherAgent.Name != agentName {
		continue
		}
		workspaceAgent = otherAgent
		break
		}
		if workspaceAgent.ID == uuid.Nil {
		return codersdk.WorkspaceAgent{}, xerrors.Errorf("agent not found by name %q", agentName)
		return otherAgent, nil
		}
		return codersdk.WorkspaceAgent{}, xerrors.Errorf("agent not found by name %q, available agents: %v", agentName, availableNames)
		}
		if workspaceAgent.ID == uuid.Nil {
		if len(agents) > 1 {
		workspaceAgent, err = cryptorand.Element(agents)
		if err != nil {
		return codersdk.WorkspaceAgent{}, err
		}
		} else {
		workspaceAgent = agents[0]
		}
		if len(subAgents) == 1 {
		return subAgents[0], nil
		} else if len(subAgents) > 1 {
		return codersdk.WorkspaceAgent{}, xerrors.Errorf("multiple sub-agents found, please specify the agent name, available agents: %v", availableNames)
		}
		if len(agents) == 1 {
		return agents[0], nil
		}
		returnworkspaceAgent, nil
		returncodersdk.WorkspaceAgent{}, 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