Oct 27, 2025 · Oct 28, 2025 · Oct 28, 2025 · Oct 28, 2025 · Oct 30, 2025 · Oct 30, 2025
diff --git a/Makefile b/Makefile
 GEN_FILES := \
 tailnet/proto/tailnet.pb.go \
 agent/proto/agent.pb.go \
 agent/agentsocket/proto/agentsocket.pb.go \
 provisionersdk/proto/provisioner.pb.go \
 provisionerd/proto/provisionerd.pb.go \
 vpn/vpn.pb.go \
 --go-drpc_opt=paths=source_relative \
 ./agent/proto/agent.proto

 agent/agentsocket/proto/agentsocket.pb.go: agent/agentsocket/proto/agentsocket.proto
 protoc \
 --go_out=. \
 --go_opt=paths=source_relative \
 --go-drpc_out=. \
 --go-drpc_opt=paths=source_relative \
 ./agent/agentsocket/proto/agentsocket.proto

 provisionersdk/proto/provisioner.pb.go: provisionersdk/proto/provisioner.proto
 protoc \
 --go_out=. \
diff --git a/agent/agent.go b/agent/agent.go
 "github.com/coder/coder/v2/agent/agentcontainers"
 "github.com/coder/coder/v2/agent/agentexec"
 "github.com/coder/coder/v2/agent/agentscripts"
 "github.com/coder/coder/v2/agent/agentsocket"
 "github.com/coder/coder/v2/agent/agentssh"
 "github.com/coder/coder/v2/agent/proto"
 "github.com/coder/coder/v2/agent/proto/resourcesmonitor"
 Devcontainers                bool
 DevcontainerAPIOptions       []agentcontainers.Option // Enable Devcontainers for these to be effective.
 Clock                        quartz.Clock
 SocketPath                   string // Path for the agent socket server
 }

 type Client interface {

 devcontainers:       options.Devcontainers,
 containerAPIOptions: options.DevcontainerAPIOptions,
 socketPath:          options.SocketPath,
 }
 // Initially, we have a closed channel, reflecting the fact that we are not initially connected.
 // Each time we connect we replace the channel (while holding the closeMutex) with a new one
 devcontainers       bool
 containerAPIOptions []agentcontainers.Option
 containerAPI        *agentcontainers.API

 socketPath   string
 socketServer *agentsocket.Server
 }

 func (a *agent) TailnetConn() *tailnet.Conn {
 s.ExperimentalContainers = a.devcontainers
 },
 )

 a.initSocketServer()

 go a.runLoop()
 }

 // initSocketServer initializes server that allows direct communication with a workspace agent using IPC.
 func (a *agent) initSocketServer() {
 if a.socketPath == "" {
 a.logger.Info(a.hardCtx, "socket server disabled (no path configured)")
 return
 }

 server, err := agentsocket.NewServer(a.socketPath, a.logger.Named("socket"))
 if err != nil {
 a.logger.Warn(a.hardCtx, "failed to create socket server", slog.Error(err))
 return
 }

 err = server.Start()
 if err != nil {
 a.logger.Warn(a.hardCtx, "failed to start socket server", slog.Error(err))
 return
 }

 a.socketServer = server
 a.logger.Debug(a.hardCtx, "socket server started", slog.F("path", a.socketPath))
 }

 // runLoop attempts to start the agent in a retry loop.
 // Coder may be offline temporarily, a connection issue
 // may be happening, but regardless after the intermittent
 lifecycleState = codersdk.WorkspaceAgentLifecycleShutdownError
 }
 }

 if a.socketServer != nil {
 if err := a.socketServer.Stop(); err != nil {
 a.logger.Error(a.hardCtx, "socket server close", slog.Error(err))
 }
 }

 a.setLifecycle(lifecycleState)

 err = a.scriptRunner.Close()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -642,6 +642,7 @@ AIBRIDGED_MOCKS := \
		GEN_FILES := \
		tailnet/proto/tailnet.pb.go \
		agent/proto/agent.pb.go \
		agent/agentsocket/proto/agentsocket.pb.go \
		provisionersdk/proto/provisioner.pb.go \
		provisionerd/proto/provisionerd.pb.go \
		vpn/vpn.pb.go \
Expand DownExpand Up		@@ -800,6 +801,14 @@ agent/proto/agent.pb.go: agent/proto/agent.proto
		--go-drpc_opt=paths=source_relative \
		./agent/proto/agent.proto

		agent/agentsocket/proto/agentsocket.pb.go: agent/agentsocket/proto/agentsocket.proto
		protoc \
		--go_out=. \
		--go_opt=paths=source_relative \
		--go-drpc_out=. \
		--go-drpc_opt=paths=source_relative \
		./agent/agentsocket/proto/agentsocket.proto

		provisionersdk/proto/provisioner.pb.go: provisionersdk/proto/provisioner.proto
		protoc \
		--go_out=. \
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,6 +40,7 @@ import (
		"github.com/coder/coder/v2/agent/agentcontainers"
		"github.com/coder/coder/v2/agent/agentexec"
		"github.com/coder/coder/v2/agent/agentscripts"
		"github.com/coder/coder/v2/agent/agentsocket"
		"github.com/coder/coder/v2/agent/agentssh"
		"github.com/coder/coder/v2/agent/proto"
		"github.com/coder/coder/v2/agent/proto/resourcesmonitor"
Expand DownExpand Up		@@ -91,6 +92,7 @@ type Options struct {
		Devcontainers bool
		DevcontainerAPIOptions []agentcontainers.Option // Enable Devcontainers for these to be effective.
		Clock quartz.Clock
		SocketPath string // Path for the agent socket server
		}

		type Client interface {
Expand DownExpand Up		@@ -190,6 +192,7 @@ func New(options Options) Agent {

		devcontainers: options.Devcontainers,
		containerAPIOptions: options.DevcontainerAPIOptions,
		socketPath: options.SocketPath,
		}
		// Initially, we have a closed channel, reflecting the fact that we are not initially connected.
		// Each time we connect we replace the channel (while holding the closeMutex) with a new one
Expand DownExpand Up		@@ -271,6 +274,9 @@ type agent struct {
		devcontainers bool
		containerAPIOptions []agentcontainers.Option
		containerAPI *agentcontainers.API

		socketPath string
		socketServer *agentsocket.Server
		}

		func (a agent) TailnetConn() tailnet.Conn {
Expand DownExpand Up		@@ -350,9 +356,35 @@ func (a *agent) init() {
		s.ExperimentalContainers = a.devcontainers
		},
		)

		a.initSocketServer()

		go a.runLoop()
		}

		// initSocketServer initializes server that allows direct communication with a workspace agent using IPC.
		func (a *agent) initSocketServer() {
		if a.socketPath == "" {
		a.logger.Info(a.hardCtx, "socket server disabled (no path configured)")
		return
		}

		server, err := agentsocket.NewServer(a.socketPath, a.logger.Named("socket"))
		if err != nil {
		a.logger.Warn(a.hardCtx, "failed to create socket server", slog.Error(err))
		return
		}

		err = server.Start()
		if err != nil {
		a.logger.Warn(a.hardCtx, "failed to start socket server", slog.Error(err))
		return
		}

		a.socketServer = server
		a.logger.Debug(a.hardCtx, "socket server started", slog.F("path", a.socketPath))
		}

		// runLoop attempts to start the agent in a retry loop.
		// Coder may be offline temporarily, a connection issue
		// may be happening, but regardless after the intermittent
Expand DownExpand Up		@@ -1920,6 +1952,13 @@ func (a *agent) Close() error {
		lifecycleState = codersdk.WorkspaceAgentLifecycleShutdownError
		}
		}

		if a.socketServer != nil {
		if err := a.socketServer.Stop(); err != nil {
		a.logger.Error(a.hardCtx, "socket server close", slog.Error(err))
		}
		}

		a.setLifecycle(lifecycleState)

		err = a.scriptRunner.Close()
Expand Down