Skip to content

feat(agent): add devcontainer autostart support #17076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Mar 27, 2025
Merged

feat(agent): add devcontainer autostart support #17076

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
63a2ec1
wip: feat(agent): add devcontainer autostart support
mafredri Mar 24, 2025
d7480cb
docs
mafredri Mar 24, 2025
9bfdfaf
expand
mafredri Mar 25, 2025
304b1a1
devcontainer scripts and timings
mafredri Mar 25, 2025
e1048b1
use name, print warning
mafredri Mar 25, 2025
d85e9a2
refactor
mafredri Mar 25, 2025
7954f8d
tmpl
mafredri Mar 25, 2025
234fc25
test
mafredri Mar 26, 2025
2d93ee3
add integration test
mafredri Mar 26, 2025
9aca1c8
unfoo
mafredri Mar 26, 2025
9c1bf01
add agentscripts test for execute option
mafredri Mar 26, 2025
ef089be
safe assign
mafredri Mar 26, 2025
55c5c46
improve logger, fix config path realtive to workspace folder
mafredri Mar 26, 2025
4676898
Update agent/agentcontainers/devcontainer.go
mafredri Mar 27, 2025
f797b41
skip path separator tests on windows
mafredri Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
docs
  • Loading branch information
@mafredri
mafredri committed Mar 25, 2025
commit d7480cb69c5019982b547a25a3461c1dcddb5767
18 changes: 15 additions & 3 deletions agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,8 +1115,13 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,
}
}

// Any defined Dev Containers may be autostarted after the start
// scripts have completed.
var postStartScripts []codersdk.WorkspaceAgentScript
for _, dc := range manifest.Devcontainers {
// TODO(mafredri): Verify `@devcontainers/cli` presence.
// TODO(mafredri): Verify workspace folder exists.
// TODO(mafredri): If set, verify config path exists.
postStartScripts = append(postStartScripts, agentcontainers.DevcontainerStartupScript(dc))
}

Expand All @@ -1126,11 +1131,18 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,
}
err = a.trackGoroutine(func() {
start := time.Now()
// here we use the graceful context because the script runner is not directly tied
// to the agent API.
// Here we use the graceful context because the script runner is
// not directly tied to the agent API.
//
// First we run the start scripts to ensure the workspace has
// been initialized and then the post start scripts which may
// depend on the workspace start scripts.
//
// Measure the time immediately after the start scripts have
// finished (both start and post start). For instance, an
// autostarted devcontainer will be included in this time.
err := a.scriptRunner.Execute(a.gracefulCtx, agentscripts.ExecuteStartScripts)
err = errors.Join(err, a.scriptRunner.Execute(a.gracefulCtx, agentscripts.ExecutePostStartScripts))
// Measure the time immediately after the script has finished
dur := time.Since(start).Seconds()
if err != nil {
a.logger.Warn(ctx, "startup script(s) failed", slog.Error(err))
Expand Down