coder
diff --git a/‎coderd/database/migrations/000151_pg_coordinator_single_tailnet.down.sql renamed to ‎coderd/database/migrations/000152_pg_coordinator_single_tailnet.down.sql b/‎coderd/database/migrations/000151_pg_coordinator_single_tailnet.down.sql renamed to ‎coderd/database/migrations/000152_pg_coordinator_single_tailnet.down.sql
diff --git a/‎coderd/database/migrations/000151_pg_coordinator_single_tailnet.up.sql renamed to ‎coderd/database/migrations/000152_pg_coordinator_single_tailnet.up.sql b/‎coderd/database/migrations/000151_pg_coordinator_single_tailnet.up.sql renamed to ‎coderd/database/migrations/000152_pg_coordinator_single_tailnet.up.sql
diff --git a/‎enterprise/coderd/workspaceproxycoordinate.go
+8 b/‎enterprise/coderd/workspaceproxycoordinate.go
+8
diff --git a/‎enterprise/wsproxy/wsproxysdk/wsproxysdk.go
+8-9 b/‎enterprise/wsproxy/wsproxysdk/wsproxysdk.go
+8-9
@@ -68,6 +68,14 @@ func (api *API) workspaceProxyCoordinate(rw http.ResponseWriter, r *http.Request
 
 	id := uuid.New()
 	sub, err := (*api.AGPL.TailnetCoordinator.Load()).ServeMultiAgent(id)
+	if err != nil {
+		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+			Message: "Failed to serve multi agent.",
+			Detail:  err.Error(),
+		})
+		return
+	}
+
 	nc := websocket.NetConn(ctx, conn, websocket.MessageText)
 	defer nc.Close()
 
 
@@ -22,7 +22,6 @@ import (
 	"github.com/coder/coder/v2/coderd/httpmw"
 	"github.com/coder/coder/v2/coderd/workspaceapps"
 	"github.com/coder/coder/v2/codersdk"
-	"github.com/coder/coder/v2/tailnet"
 	agpl "github.com/coder/coder/v2/tailnet"
 )
 
@@ -423,14 +422,14 @@ const (
 type CoordinateMessage struct {
 	Type    CoordinateMessageType `json:"type"`
 	AgentID uuid.UUID             `json:"agent_id"`
-	Node    *tailnet.Node         `json:"node"`
+	Node    *agpl.Node            `json:"node"`
 }
 
 type CoordinateNodes struct {
-	Nodes []*tailnet.Node
+	Nodes []*agpl.Node
 }
 
-func (c *Client) DialCoordinator(ctx context.Context) (tailnet.MultiAgentConn, error) {
+func (c *Client) DialCoordinator(ctx context.Context) (agpl.MultiAgentConn, error) {
 	ctx, cancel := context.WithCancel(ctx)
 
 	coordinateURL, err := c.SDKClient.URL.Parse("/api/v2/workspaceproxies/me/coordinate")
@@ -464,7 +463,7 @@ func (c *Client) DialCoordinator(ctx context.Context) (tailnet.MultiAgentConn, e
 		legacyAgentCache: map[uuid.UUID]bool{},
 	}
 
-	ma := (&tailnet.MultiAgent{
+	ma := (&agpl.MultiAgent{
 		ID:                uuid.New(),
 		AgentIsLegacyFunc: rma.AgentIsLegacy,
 		OnSubscribe:       rma.OnSubscribe,
@@ -516,7 +515,7 @@ func (a *remoteMultiAgentHandler) writeJSON(v interface{}) error {
 
 	// Set a deadline so that hung connections don't put back pressure on the system.
 	// Node updates are tiny, so even the dinkiest connection can handle them if it's not hung.
-	err = a.nc.SetWriteDeadline(time.Now().Add(tailnet.WriteTimeout))
+	err = a.nc.SetWriteDeadline(time.Now().Add(agpl.WriteTimeout))
 	if err != nil {
 		return xerrors.Errorf("set write deadline: %w", err)
 	}
@@ -538,21 +537,21 @@ func (a *remoteMultiAgentHandler) writeJSON(v interface{}) error {
 	return nil
 }
 
-func (a *remoteMultiAgentHandler) OnNodeUpdate(_ uuid.UUID, node *tailnet.Node) error {
+func (a *remoteMultiAgentHandler) OnNodeUpdate(_ uuid.UUID, node *agpl.Node) error {
 	return a.writeJSON(CoordinateMessage{
 		Type: CoordinateMessageTypeNodeUpdate,
 		Node: node,
 	})
 }
 
-func (a *remoteMultiAgentHandler) OnSubscribe(_ tailnet.Queue, agentID uuid.UUID) (*tailnet.Node, error) {
+func (a *remoteMultiAgentHandler) OnSubscribe(_ agpl.Queue, agentID uuid.UUID) (*agpl.Node, error) {
 	return nil, a.writeJSON(CoordinateMessage{
 		Type:    CoordinateMessageTypeSubscribe,
 		AgentID: agentID,
 	})
 }
 
-func (a *remoteMultiAgentHandler) OnUnsubscribe(_ tailnet.Queue, agentID uuid.UUID) error {
+func (a *remoteMultiAgentHandler) OnUnsubscribe(_ agpl.Queue, agentID uuid.UUID) error {
 	return a.writeJSON(CoordinateMessage{
 		Type:    CoordinateMessageTypeUnsubscribe,
 		AgentID: agentID,