@@ -456,7 +456,7 @@ func (t *trySingleflight) Do(key string, fn func()) {
456456fn ()
457457}
458458
459- func (a * agent )reportMetadata (ctx context.Context ,aAPI proto.DRPCAgentClient24 )error {
459+ func (a * agent )reportMetadata (ctx context.Context ,aAPI proto.DRPCAgentClient26 )error {
460460tickerDone := make (chan struct {})
461461collectDone := make (chan struct {})
462462ctx ,cancel := context .WithCancel (ctx )
@@ -672,7 +672,7 @@ func (a *agent) reportMetadata(ctx context.Context, aAPI proto.DRPCAgentClient24
672672
673673// reportLifecycle reports the current lifecycle state once. All state
674674// changes are reported in order.
675- func (a * agent )reportLifecycle (ctx context.Context ,aAPI proto.DRPCAgentClient24 )error {
675+ func (a * agent )reportLifecycle (ctx context.Context ,aAPI proto.DRPCAgentClient26 )error {
676676for {
677677select {
678678case <- a .lifecycleUpdate :
@@ -752,7 +752,7 @@ func (a *agent) setLifecycle(state codersdk.WorkspaceAgentLifecycle) {
752752}
753753
754754// reportConnectionsLoop reports connections to the agent for auditing.
755- func (a * agent )reportConnectionsLoop (ctx context.Context ,aAPI proto.DRPCAgentClient24 )error {
755+ func (a * agent )reportConnectionsLoop (ctx context.Context ,aAPI proto.DRPCAgentClient26 )error {
756756for {
757757select {
758758case <- a .reportConnectionsUpdate :
@@ -872,7 +872,7 @@ func (a *agent) reportConnection(id uuid.UUID, connectionType proto.Connection_T
872872// fetchServiceBannerLoop fetches the service banner on an interval. It will
873873// not be fetched immediately; the expectation is that it is primed elsewhere
874874// (and must be done before the session actually starts).
875- func (a * agent )fetchServiceBannerLoop (ctx context.Context ,aAPI proto.DRPCAgentClient24 )error {
875+ func (a * agent )fetchServiceBannerLoop (ctx context.Context ,aAPI proto.DRPCAgentClient26 )error {
876876ticker := time .NewTicker (a .announcementBannersRefreshInterval )
877877defer ticker .Stop ()
878878for {
@@ -925,7 +925,7 @@ func (a *agent) run() (retErr error) {
925925connMan := newAPIConnRoutineManager (a .gracefulCtx ,a .hardCtx ,a .logger ,aAPI ,tAPI )
926926
927927connMan .startAgentAPI ("init notification banners" ,gracefulShutdownBehaviorStop ,
928- func (ctx context.Context ,aAPI proto.DRPCAgentClient24 )error {
928+ func (ctx context.Context ,aAPI proto.DRPCAgentClient26 )error {
929929bannersProto ,err := aAPI .GetAnnouncementBanners (ctx ,& proto.GetAnnouncementBannersRequest {})
930930if err != nil {
931931return xerrors .Errorf ("fetch service banner: %w" ,err )
@@ -942,7 +942,7 @@ func (a *agent) run() (retErr error) {
942942// sending logs gets gracefulShutdownBehaviorRemain because we want to send logs generated by
943943// shutdown scripts.
944944connMan .startAgentAPI ("send logs" ,gracefulShutdownBehaviorRemain ,
945- func (ctx context.Context ,aAPI proto.DRPCAgentClient24 )error {
945+ func (ctx context.Context ,aAPI proto.DRPCAgentClient26 )error {
946946err := a .logSender .SendLoop (ctx ,aAPI )
947947if xerrors .Is (err ,agentsdk .ErrLogLimitExceeded ) {
948948// we don't want this error to tear down the API connection and propagate to the
@@ -961,7 +961,7 @@ func (a *agent) run() (retErr error) {
961961connMan .startAgentAPI ("report metadata" ,gracefulShutdownBehaviorStop ,a .reportMetadata )
962962
963963// resources monitor can cease as soon as we start gracefully shutting down.
964- connMan .startAgentAPI ("resources monitor" ,gracefulShutdownBehaviorStop ,func (ctx context.Context ,aAPI proto.DRPCAgentClient24 )error {
964+ connMan .startAgentAPI ("resources monitor" ,gracefulShutdownBehaviorStop ,func (ctx context.Context ,aAPI proto.DRPCAgentClient26 )error {
965965logger := a .logger .Named ("resources_monitor" )
966966clk := quartz .NewReal ()
967967config ,err := aAPI .GetResourcesMonitoringConfiguration (ctx ,& proto.GetResourcesMonitoringConfigurationRequest {})
@@ -1008,7 +1008,7 @@ func (a *agent) run() (retErr error) {
10081008connMan .startAgentAPI ("handle manifest" ,gracefulShutdownBehaviorStop ,a .handleManifest (manifestOK ))
10091009
10101010connMan .startAgentAPI ("app health reporter" ,gracefulShutdownBehaviorStop ,
1011- func (ctx context.Context ,aAPI proto.DRPCAgentClient24 )error {
1011+ func (ctx context.Context ,aAPI proto.DRPCAgentClient26 )error {
10121012if err := manifestOK .wait (ctx );err != nil {
10131013return xerrors .Errorf ("no manifest: %w" ,err )
10141014}
@@ -1041,7 +1041,7 @@ func (a *agent) run() (retErr error) {
10411041
10421042connMan .startAgentAPI ("fetch service banner loop" ,gracefulShutdownBehaviorStop ,a .fetchServiceBannerLoop )
10431043
1044- connMan .startAgentAPI ("stats report loop" ,gracefulShutdownBehaviorStop ,func (ctx context.Context ,aAPI proto.DRPCAgentClient24 )error {
1044+ connMan .startAgentAPI ("stats report loop" ,gracefulShutdownBehaviorStop ,func (ctx context.Context ,aAPI proto.DRPCAgentClient26 )error {
10451045if err := networkOK .wait (ctx );err != nil {
10461046return xerrors .Errorf ("no network: %w" ,err )
10471047}
@@ -1056,8 +1056,8 @@ func (a *agent) run() (retErr error) {
10561056}
10571057
10581058// handleManifest returns a function that fetches and processes the manifest
1059- func (a * agent )handleManifest (manifestOK * checkpoint )func (ctx context.Context ,aAPI proto.DRPCAgentClient24 )error {
1060- return func (ctx context.Context ,aAPI proto.DRPCAgentClient24 )error {
1059+ func (a * agent )handleManifest (manifestOK * checkpoint )func (ctx context.Context ,aAPI proto.DRPCAgentClient26 )error {
1060+ return func (ctx context.Context ,aAPI proto.DRPCAgentClient26 )error {
10611061var (
10621062sentResult = false
10631063err error
@@ -1080,6 +1080,18 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,
10801080if manifest .AgentID == uuid .Nil {
10811081return xerrors .New ("nil agentID returned by manifest" )
10821082}
1083+ if manifest .ParentID != uuid .Nil {
1084+ // This is a sub agent, disable all the features that should not
1085+ // be used by sub agents.
1086+ a .logger .Debug (ctx ,"sub agent detected, disabling features" ,
1087+ slog .F ("parent_id" ,manifest .ParentID ),
1088+ slog .F ("agent_id" ,manifest .AgentID ),
1089+ )
1090+ if a .experimentalDevcontainersEnabled {
1091+ a .logger .Info (ctx ,"devcontainers are not supported on sub agents, disabling feature" )
1092+ a .experimentalDevcontainersEnabled = false
1093+ }
1094+ }
10831095a .client .RewriteDERPMap (manifest .DERPMap )
10841096
10851097// Expand the directory and send it back to coderd so external
@@ -1187,8 +1199,8 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,
11871199
11881200// createOrUpdateNetwork waits for the manifest to be set using manifestOK, then creates or updates
11891201// the tailnet using the information in the manifest
1190- func (a * agent )createOrUpdateNetwork (manifestOK ,networkOK * checkpoint )func (context.Context , proto.DRPCAgentClient24 )error {
1191- return func (ctx context.Context ,_ proto.DRPCAgentClient24 ) (retErr error ) {
1202+ func (a * agent )createOrUpdateNetwork (manifestOK ,networkOK * checkpoint )func (context.Context , proto.DRPCAgentClient26 )error {
1203+ return func (ctx context.Context ,aAPI proto.DRPCAgentClient26 ) (retErr error ) {
11921204if err := manifestOK .wait (ctx );err != nil {
11931205return xerrors .Errorf ("no manifest: %w" ,err )
11941206}
@@ -1200,14 +1212,15 @@ func (a *agent) createOrUpdateNetwork(manifestOK, networkOK *checkpoint) func(co
12001212network := a .network
12011213a .closeMutex .Unlock ()
12021214if network == nil {
1203- keySeed ,err := SSHKeySeed (manifest .OwnerUsername ,manifest .WorkspaceName ,manifest .AgentName )
1215+ keySeed ,err := SSHKeySeed (manifest .OwnerName ,manifest .WorkspaceName ,manifest .AgentName )
12041216if err != nil {
12051217return xerrors .Errorf ("generate SSH key seed: %w" ,err )
12061218}
12071219// use the graceful context here, because creating the tailnet is not itself tied to the
12081220// agent API.
12091221network ,err = a .createTailnet (
12101222a .gracefulCtx ,
1223+ aAPI ,
12111224manifest .AgentID ,
12121225manifest .DERPMap ,
12131226manifest .DERPForceWebSockets ,
@@ -1355,6 +1368,7 @@ func (a *agent) trackGoroutine(fn func()) error {
13551368
13561369func (a * agent )createTailnet (
13571370ctx context.Context ,
1371+ aAPI proto.DRPCAgentClient26 ,
13581372agentID uuid.UUID ,
13591373derpMap * tailcfg.DERPMap ,
13601374derpForceWebSockets ,disableDirectConnections bool ,
@@ -1487,7 +1501,7 @@ func (a *agent) createTailnet(
14871501}()
14881502if err = a .trackGoroutine (func () {
14891503defer apiListener .Close ()
1490- apiHandler ,closeAPIHAndler := a .apiHandler ()
1504+ apiHandler ,closeAPIHAndler := a .apiHandler (aAPI )
14911505defer func () {
14921506_ = closeAPIHAndler ()
14931507}()
@@ -1960,7 +1974,7 @@ const (
19601974
19611975type apiConnRoutineManager struct {
19621976logger slog.Logger
1963- aAPI proto.DRPCAgentClient24
1977+ aAPI proto.DRPCAgentClient26
19641978tAPI tailnetproto.DRPCTailnetClient24
19651979eg * errgroup.Group
19661980stopCtx context.Context
@@ -1969,7 +1983,7 @@ type apiConnRoutineManager struct {
19691983
19701984func newAPIConnRoutineManager (
19711985gracefulCtx ,hardCtx context.Context ,logger slog.Logger ,
1972- aAPI proto.DRPCAgentClient24 ,tAPI tailnetproto.DRPCTailnetClient24 ,
1986+ aAPI proto.DRPCAgentClient26 ,tAPI tailnetproto.DRPCTailnetClient24 ,
19731987)* apiConnRoutineManager {
19741988// routines that remain in operation during graceful shutdown use the remainCtx. They'll still
19751989// exit if the errgroup hits an error, which usually means a problem with the conn.
@@ -2002,7 +2016,7 @@ func newAPIConnRoutineManager(
20022016// but for Tailnet.
20032017func (a * apiConnRoutineManager )startAgentAPI (
20042018name string ,behavior gracefulShutdownBehavior ,
2005- f func (context.Context , proto.DRPCAgentClient24 )error ,
2019+ f func (context.Context , proto.DRPCAgentClient26 )error ,
20062020) {
20072021logger := a .logger .With (slog .F ("name" ,name ))
20082022var ctx context.Context