appease the linter

SasSwart · SasSwart · commit 0308560fef6a · 2025-11-13T10:01:46.000Z
diff --git a/agent/agentsocket/server.go b/agent/agentsocket/server.go
@@ -19,6 +19,25 @@ import (
 	"github.com/coder/coder/v2/codersdk/drpcsdk"
 )
 
+// Client wraps a DRPC client with connection management.
+// This type is defined here so it's available on all platforms.
+type Client struct {
+	proto.DRPCAgentSocketClient
+	conn    net.Conn
+	session *yamux.Session
+}
+
+// Close closes the client connection.
+func (c *Client) Close() error {
+	if c.session != nil {
+		_ = c.session.Close()
+	}
+	if c.conn != nil {
+		return c.conn.Close()
+	}
+	return nil
+}
+
 // Server provides access to the DRPCAgentSocketService via a Unix domain socket.
 // Do not invoke Server{} directly. Use NewServer() instead.
 type Server struct {
diff --git a/agent/agentsocket/service.go b/agent/agentsocket/service.go
@@ -59,17 +59,23 @@ func (s *DRPCAgentSocketService) SyncStart(_ context.Context, req *proto.SyncSta
 		}, nil
 	}
 	if !isReady {
+		return nil, errors.New("Unit is not ready")
+	}
+
+	// Check if unit is already started
+	currentStatus, err := s.unitManager.GetStatus(req.Unit)
+	if err != nil && !errors.Is(err, unit.ErrConsumerNotFound) {
 		return &proto.SyncStartResponse{
 			Success: false,
-			Message: "Unit is not ready",
+			Message: "Failed to get unit status: " + err.Error(),
 		}, nil
 	}
+	if currentStatus == unit.StatusStarted {
+		return nil, unit.ErrSameStatusAlreadySet
+	}
 
 	if err := s.unitManager.UpdateStatus(req.Unit, unit.StatusStarted); err != nil {
-		return &proto.SyncStartResponse{
-			Success: false,
-			Message: "Failed to update status: " + err.Error(),
-		}, nil
+		return nil, err
 	}
 
 	return &proto.SyncStartResponse{
diff --git a/agent/agentsocket/socket_unix.go b/agent/agentsocket/socket_unix.go
@@ -3,12 +3,18 @@
 package agentsocket
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"os"
 	"path/filepath"
 
+	"github.com/hashicorp/yamux"
 	"golang.org/x/xerrors"
+
+	"cdr.dev/slog"
+	"github.com/coder/coder/v2/agent/agentsocket/proto"
+	"github.com/coder/coder/v2/codersdk/drpcsdk"
 )
 
 // createSocket creates a Unix domain socket listener
@@ -74,3 +80,25 @@ func isSocketAvailable(path string) bool {
 	// Socket is in use
 	return false
 }
+
+// NewClient creates a DRPC client for the agent socket at the given path.
+func NewClient(path string, logger slog.Logger) (*Client, error) {
+	conn, err := net.Dial("unix", path)
+	if err != nil {
+		return nil, xerrors.Errorf("dial unix socket: %w", err)
+	}
+
+	config := yamux.DefaultConfig()
+	config.LogOutput = nil
+	config.Logger = slog.Stdlib(context.Background(), logger, slog.LevelInfo)
+	session, err := yamux.Client(conn, config)
+	if err != nil {
+		_ = conn.Close()
+		return nil, xerrors.Errorf("multiplex client: %w", err)
+	}
+	return &Client{
+		DRPCAgentSocketClient: proto.NewDRPCAgentSocketClient(drpcsdk.MultiplexedConn(session)),
+		conn:                  conn,
+		session:               session,
+	}, nil
+}
diff --git a/agent/agentsocket/socket_windows.go b/agent/agentsocket/socket_windows.go
@@ -3,10 +3,15 @@
 package agentsocket
 
 import (
+	"context"
 	"net"
 	"os"
 	"time"
 
+	"cdr.dev/slog"
+	"github.com/coder/coder/v2/agent/agentsocket/proto"
+	"github.com/coder/coder/v2/codersdk/drpcsdk"
+	"github.com/hashicorp/yamux"
 	"golang.org/x/xerrors"
 )
 
@@ -51,3 +56,25 @@ type SocketInfo struct {
 	Owner   string
 	Group   string
 }
+
+// NewClient creates a DRPC client for the agent socket at the given path.
+func NewClient(path string, logger slog.Logger) (*Client, error) {
+	conn, err := net.Dial("unix", path)
+	if err != nil {
+		return nil, xerrors.Errorf("dial unix socket: %w", err)
+	}
+
+	config := yamux.DefaultConfig()
+	config.LogOutput = nil
+	config.Logger = slog.Stdlib(context.Background(), logger, slog.LevelInfo)
+	session, err := yamux.Client(conn, config)
+	if err != nil {
+		_ = conn.Close()
+		return nil, xerrors.Errorf("multiplex client: %w", err)
+	}
+	return &Client{
+		DRPCAgentSocketClient: proto.NewDRPCAgentSocketClient(drpcsdk.MultiplexedConn(session)),
+		conn:                  conn,
+		session:               session,
+	}, nil
+}
diff --git a/cli/testdata/coder_agent_--help.golden b/cli/testdata/coder_agent_--help.golden
@@ -67,6 +67,9 @@ OPTIONS:
       --script-data-dir string, $CODER_AGENT_SCRIPT_DATA_DIR (default: /tmp)
           Specify the location for storing script data.
 
+      --socket-path string, $CODER_AGENT_SOCKET_PATH
+          Specify the path for the agent socket.
+
       --ssh-max-timeout duration, $CODER_AGENT_SSH_MAX_TIMEOUT (default: 72h)
           Specify the max timeout for a SSH connection, it is advisable to set
           it to a minimum of 60s, but no more than 72h.
