mirror of
https://github.com/coder/coder.git
synced 2026-06-02 20:48:20 +00:00
ce627bf23f
closes: https://github.com/coder/coder/issues/10352 closes: https://github.com/coder/internal/issues/1094 closes: https://github.com/coder/internal/issues/1095 In this pull request, we enable a new set of experimental cli commands grouped under `coder exp sync`. These commands allow any process acting within a coder workspace to inform the coder agent of its requirements and execution progress. The coder agent will then relay this information to other processes that have subscribed. These commands are: ``` # Check if this feature is enabled in your environment coder exp sync ping # express that your unit depends on another coder exp sync want <unit> <dependency_unit> # express that your unit intends to start a portion of the script that requires # other units to have completed first. This command blocks until all dependencies have been met coder exp sync start <unit> # express that your unit has completes its work, allowing dependent units to begin their execution coder exp sync complete <unit> ``` Example: In order to automatically run claude code in a new workspace, it must first have a git repository cloned. The scripts responsible for cloning the repository and for running claude code would coordinate in the following way: ```bash # Script A: Claude code # Inform the agent that the claude script wants the git script. # That is, the git script must have completed before the claude script can begin its execution coder exp sync want claude git # Inform the agent that we would now like to begin execution of claude. # This command will block until the git script (and any other defined dependencies) # have completed coder exp sync start claude # Now we run claude code and any other commands we need claude ... # Once our script has completed, we inform the agent, so that any scripts that depend on this one # may begin their execution coder exp sync complete claude ``` ```bash # Script B: Git # Because the git script does not have any dependencies, we can simply inform the agent that we # intend to start coder exp sync start git git clone ssh://git@github.com/coder/coder # Once the repository have been cloned, we inform the agent that this script is complete, so that # scripts that depend on it may begin their execution. coder exp sync complete git ``` Notes: * Unit names (ie. `claude` and `git`) given as input to the sync commands are arbitrary strings. You do not have to conform to specific identifiers. We recommend naming your scripts descriptively, but succinctly. * Scripts unit names should be well documented. Other scripts will need to know the names you've chosen in order to depend on yours. Therefore, you --------- Co-authored-by: Mathias Fredriksson <mafredri@gmail.com>
139 lines
3.2 KiB
Go
139 lines
3.2 KiB
Go
package agentsocket
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net"
|
|
"sync"
|
|
|
|
"golang.org/x/xerrors"
|
|
"storj.io/drpc/drpcmux"
|
|
"storj.io/drpc/drpcserver"
|
|
|
|
"cdr.dev/slog"
|
|
"github.com/coder/coder/v2/agent/agentsocket/proto"
|
|
"github.com/coder/coder/v2/agent/unit"
|
|
"github.com/coder/coder/v2/codersdk/drpcsdk"
|
|
)
|
|
|
|
// Server provides access to the DRPCAgentSocketService via a Unix domain socket.
|
|
// Do not invoke Server{} directly. Use NewServer() instead.
|
|
type Server struct {
|
|
logger slog.Logger
|
|
path string
|
|
drpcServer *drpcserver.Server
|
|
service *DRPCAgentSocketService
|
|
|
|
mu sync.Mutex
|
|
listener net.Listener
|
|
ctx context.Context
|
|
cancel context.CancelFunc
|
|
wg sync.WaitGroup
|
|
}
|
|
|
|
// NewServer creates a new agent socket server.
|
|
func NewServer(logger slog.Logger, opts ...Option) (*Server, error) {
|
|
options := &options{}
|
|
for _, opt := range opts {
|
|
opt(options)
|
|
}
|
|
|
|
logger = logger.Named("agentsocket-server")
|
|
server := &Server{
|
|
logger: logger,
|
|
path: options.path,
|
|
service: &DRPCAgentSocketService{
|
|
logger: logger,
|
|
unitManager: unit.NewManager(),
|
|
},
|
|
}
|
|
|
|
mux := drpcmux.New()
|
|
err := proto.DRPCRegisterAgentSocket(mux, server.service)
|
|
if err != nil {
|
|
return nil, xerrors.Errorf("failed to register drpc service: %w", err)
|
|
}
|
|
|
|
server.drpcServer = drpcserver.NewWithOptions(mux, drpcserver.Options{
|
|
Manager: drpcsdk.DefaultDRPCOptions(nil),
|
|
Log: func(err error) {
|
|
if errors.Is(err, context.Canceled) ||
|
|
errors.Is(err, context.DeadlineExceeded) {
|
|
return
|
|
}
|
|
logger.Debug(context.Background(), "drpc server error", slog.Error(err))
|
|
},
|
|
})
|
|
|
|
listener, err := createSocket(server.path)
|
|
if err != nil {
|
|
return nil, xerrors.Errorf("create socket: %w", err)
|
|
}
|
|
|
|
server.listener = listener
|
|
|
|
// This context is canceled by server.Close().
|
|
// canceling it will close all connections.
|
|
server.ctx, server.cancel = context.WithCancel(context.Background())
|
|
|
|
server.logger.Info(server.ctx, "agent socket server started", slog.F("path", server.path))
|
|
|
|
server.wg.Add(1)
|
|
go func() {
|
|
defer server.wg.Done()
|
|
server.acceptConnections()
|
|
}()
|
|
|
|
return server, nil
|
|
}
|
|
|
|
// Close stops the server and cleans up resources.
|
|
func (s *Server) Close() error {
|
|
s.mu.Lock()
|
|
|
|
if s.listener == nil {
|
|
s.mu.Unlock()
|
|
return nil
|
|
}
|
|
|
|
s.logger.Info(s.ctx, "stopping agent socket server")
|
|
|
|
s.cancel()
|
|
|
|
if err := s.listener.Close(); err != nil {
|
|
s.logger.Warn(s.ctx, "error closing socket listener", slog.Error(err))
|
|
}
|
|
|
|
s.listener = nil
|
|
|
|
s.mu.Unlock()
|
|
|
|
// Wait for all connections to finish
|
|
s.wg.Wait()
|
|
|
|
if err := cleanupSocket(s.path); err != nil {
|
|
s.logger.Warn(s.ctx, "error cleaning up socket file", slog.Error(err))
|
|
}
|
|
|
|
s.logger.Info(s.ctx, "agent socket server stopped")
|
|
|
|
return nil
|
|
}
|
|
|
|
func (s *Server) acceptConnections() {
|
|
// In an edge case, Close() might race with acceptConnections() and set s.listener to nil.
|
|
// Therefore, we grab a copy of the listener under a lock. We might still get a nil listener,
|
|
// but then we know close has already run and we can return early.
|
|
s.mu.Lock()
|
|
listener := s.listener
|
|
s.mu.Unlock()
|
|
if listener == nil {
|
|
return
|
|
}
|
|
|
|
err := s.drpcServer.Serve(s.ctx, listener)
|
|
if err != nil {
|
|
s.logger.Warn(s.ctx, "error serving drpc server", slog.Error(err))
|
|
}
|
|
}
|