Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
f4d96c7
feat(workspacelogs): add run store for retained build and lifecycle o…
skevetter Oct 31, 2026
a66c65c
chore: sync branch with main
skevetter Oct 31, 2026
a1a3143
feat(build): retain redacted build output before log filtering
skevetter Oct 31, 2026
2197fc8
feat(subprocess): tee redacted output to an optional diagnostic sink
skevetter Oct 31, 2026
7e1b57e
feat(task): carry run identity on tasks, envelopes and failure context
skevetter Oct 31, 2026
b8a293c
feat(up): record setup history for foreground and detached runs
skevetter Oct 31, 2026
7e68a90
feat(agent): record setup history on the provider host and in the con…
skevetter Oct 31, 2026
8c0fe39
feat(build): merge retained build output capture
skevetter Oct 31, 2026
766c373
feat(setup): record lifecycle hook invocations and output
skevetter Oct 31, 2026
d8d9e4b
feat(tunnel): mirror setup logs to the next host over the tunnel
skevetter Oct 31, 2026
6ab3b66
feat(build): record setup history for workspace build
skevetter Oct 31, 2026
1627350
feat(lifecycle): record initialize and run-user-commands hook output
skevetter Oct 31, 2026
e09e238
feat(driver): add exec-only command mode that never starts the workload
skevetter Oct 31, 2026
3ccae64
feat(tunnel): merge setup log mirroring
skevetter Oct 31, 2026
3b2095f
feat(workspacelogs): add read-only spool resolver and validated remot…
skevetter Oct 31, 2026
d00d373
docs(logs): document retained setup history
skevetter Oct 31, 2026
c87ef73
feat(hooks): merge lifecycle hook capture
skevetter Oct 31, 2026
2cf7e62
feat(workspace): read retained setup output with logs --source setup
skevetter Oct 31, 2026
abf8823
feat(desktop): show retained build and lifecycle history in workspace…
skevetter Oct 31, 2026
9d930af
docs: merge retained setup output docs
skevetter Oct 31, 2026
7a9b183
feat(agent): mirror setup history over the tunnel at each hop
skevetter Oct 31, 2026
f237358
feat(workspace): merge setup history read path
skevetter Oct 31, 2026
a6c2c96
refactor(workspacelogs): reduce complexity and clear lint findings
skevetter Oct 31, 2026
346d728
feat(devcontainer): record initialize exclusions and share the spool …
skevetter Oct 31, 2026
1128763
feat(desktop): merge setup history UI
skevetter Oct 31, 2026
4abb265
test(e2e): cover retained setup logs end to end
skevetter Oct 31, 2026
c35dfe4
test(workspacelogs): check Go responses against the Desktop parser
skevetter Oct 31, 2026
6186365
refactor(workspacelogs): simplify golden normalization
skevetter Oct 31, 2026
32a2c74
fix(workspacelogs): keep resumed workers from repeating the run plan
skevetter Oct 31, 2026
c9aacfa
test(e2e): add setup history acceptance specs
skevetter Oct 31, 2026
69243ad
refactor(lint): write command output through os.Stdout
skevetter Oct 31, 2026
4dce393
refactor(lint): simplify small findings in config, setup, dockercrede…
skevetter Oct 31, 2026
e7a2263
refactor(lint): fix lint findings in agent, command, compose, config,…
skevetter Oct 31, 2026
bf94db3
refactor(lint): fix lint findings in buildkit remote
skevetter Oct 31, 2026
3c14fbe
refactor(lint): fix driver findings
skevetter Oct 31, 2026
d67c824
refactor(lint): split long and complex devcontainer functions
skevetter Oct 31, 2026
03e5319
refactor(lint): partial lint fixes for group 0
skevetter Oct 31, 2026
aa0aea8
refactor(lint): partial lint fixes for group 1
skevetter Oct 31, 2026
9c76cf8
refactor(lint): partial lint fixes for group 2
skevetter Oct 31, 2026
fb2b84a
refactor(lint): partial lint fixes for group 3
skevetter Oct 31, 2026
8e88c24
refactor(lint): partial lint fixes for group 4
skevetter Oct 31, 2026
c7af9b0
refactor(lint): partial lint fixes for group 5
skevetter Oct 31, 2026
4417b9f
refactor(lint): merge lint group 0 fixes
skevetter Oct 31, 2026
e180eb2
refactor(lint): merge lint group 1 fixes
skevetter Oct 31, 2026
4b375d1
refactor(lint): merge lint group 2 fixes
skevetter Oct 31, 2026
3f76fcd
refactor(lint): merge lint group 3 fixes
skevetter Oct 31, 2026
564fb35
refactor(lint): merge lint group 4 fixes
skevetter Oct 31, 2026
a49a636
refactor(lint): merge lint group 5 fixes
skevetter Oct 31, 2026
672c517
fix(devcontainer): restore JSON expectations in parse tests
skevetter Oct 31, 2026
90484e8
refactor(lint): bundle argument lists and drop unused helpers
skevetter Oct 31, 2026
82b0f1b
refactor(lint): merge group 5 progress
skevetter Oct 31, 2026
9a2de00
refactor(lint): name repeated string literals
skevetter Oct 31, 2026
8a41c84
refactor(lint): use errors.AsType and print through os.Stdout
skevetter Oct 31, 2026
78f8b01
refactor(lint): order methods to satisfy funcorder
skevetter Oct 31, 2026
995a732
refactor(lint): fix file permissions and document intentional gosec e…
skevetter Oct 31, 2026
931d4cb
refactor(lint): clear forbidigo, errcheck and unparam findings
skevetter Oct 31, 2026
333e9d2
refactor(lint): finish forbidigo, gosec and lll findings
skevetter Oct 31, 2026
a43b440
refactor(lint): extract predicates from delete and quiesce
skevetter Oct 31, 2026
ece469d
refactor(lint): replace long parameter lists with request structs
skevetter Oct 31, 2026
3a69b6f
refactor(lint): introduce request structs for remaining argument-heav…
skevetter Oct 31, 2026
0d5991e
refactor(lint): pass request structs to completion and daemon config …
skevetter Oct 31, 2026
f4c26f5
refactor(lint): split command bodies into helpers without changing lo…
skevetter Oct 31, 2026
8bda1ea
refactor(lint): extract helpers from docker and parameter lookups
skevetter Oct 31, 2026
b93d30a
refactor(lint): split status parsing and envelope test assertions
skevetter Oct 31, 2026
9210406
refactor(lint): fix alias and test helper shapes
skevetter Oct 31, 2026
4b1fe48
refactor(lint): extract helpers from daemon config and provider update
skevetter Oct 31, 2026
fc32e6a
refactor(lint): split git runner and streamer capture helpers
skevetter Oct 31, 2026
f420eda
refactor(lint): split microsandbox run into preconditions, existence …
skevetter Oct 31, 2026
37ec44c
refactor(lint): reorder microsandbox methods and split test helpers
skevetter Oct 31, 2026
c6d9d33
refactor(lint): clear remaining golangci findings
skevetter Oct 31, 2026
d8790e7
chore: merge main into feat/workspacelogs-store
skevetter Oct 31, 2026
3ef3be1
test(ci): assign setup-logs label to the logs suite
skevetter Oct 31, 2026
ff4137b
fix(workspacelogs): validate mirrored records and answer producer cap…
skevetter Oct 31, 2026
211cdae
fix(workspacelogs): keep following local runs without a refresh path
skevetter Oct 31, 2026
640f3e7
refactor(lint): reduce complexity in launch, delivery and pod lifecyc…
skevetter Oct 31, 2026
f25cfab
fix(workspacelogs): retain final outcomes, per-producer discovery, ac…
skevetter Oct 31, 2026
9219143
fix(desktop): order invocation transitions across producers
skevetter Nov 1, 2026
21369d3
fix(desktop): keep executed hook results over marker skips
skevetter Nov 1, 2026
7850cbb
Merge remote-tracking branch 'origin/main' into feat/workspacelogs-store
skevetter Nov 1, 2026
2a33fba
refactor(lint): remove revive suppressions
skevetter Nov 1, 2026
f9658fd
fix(workspacelogs): harden run recording, import and readers
skevetter Nov 1, 2026
ca3b362
refactor(lint): reduce complexity and repeated literals
skevetter Nov 1, 2026
3887bb7
fix(workspacelogs): mask build secrets and keep export cancellable
skevetter Nov 1, 2026
86f9303
Merge remote-tracking branch 'origin/main' into feat/workspacelogs-store
skevetter Nov 1, 2026
a78ffc2
refactor(lint): reduce help command rendering complexity
skevetter Nov 1, 2026
9222249
fix(desktop): keep polling while any history source is available
skevetter Nov 1, 2026
425b322
fix(workspace): restore reverse port-forward endpoint order
skevetter Nov 1, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
110 changes: 72 additions & 38 deletions cmd/ci/ci.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,49 +215,23 @@ func (cmd *CICmd) execute(ctx context.Context, source string) (err error) {
return err
}

devsyConfig, cfgErr := config.LoadConfig(cmd.Context, cmd.Provider)
devsyConfig, cfgErr := cmd.loadConfig()
if cfgErr != nil {
return cfgErr
}
if devsyConfig.ContextOption(config.ContextOptionSSHStrictHostKeyChecking) == config.BoolTrue {
cmd.StrictHostKeyChecking = true
}

workspaceClient, cleanup, teardown, resolveErr := cmd.resolveWorkspace(ctx, devsyConfig, source)
resolved, resolveErr := cmd.resolveWorkspace(ctx, devsyConfig, source)
if resolveErr != nil {
return resolveErr
}
// cleanup tears down the workspace; join error with the result.
// release tears down the workspace; join error with the result.
defer func() {
var cleanupErr error
if teardown {
cleanupErr = status.Run(context.Background(), reporter, status.Operation{
Phase: status.PhaseDeletingWorkspace,
}, func(context.Context) error {
return cleanup()
})
} else {
cleanupErr = cleanup()
}
err = errors.Join(err, cleanupErr)
err = errors.Join(err, resolved.release(reporter))
}()
workspaceClient := resolved.client

if _, ok := workspaceClient.(client.WorkspaceClient); !ok {
return fmt.Errorf("ci is currently not supported for proxy providers")
}

cmd.WaitFor = string(setup.PhasePostCreate)

if _, err := up.RunHeadless(ctx, workspaceClient, up.HeadlessOptions{
GlobalFlags: cmd.GlobalFlags,
DevsyConfig: devsyConfig,
CLIOptions: cmd.CLIOptions,
Reporter: reporter,
ProviderOptions: cmd.ProviderOptions,
SecretsFile: cmd.SecretsFile,
FeatureSecretsFile: cmd.FeatureSecretsFile,
}); err != nil {
return fmt.Errorf("start devcontainer: %w", err)
if err := cmd.startWorkspace(ctx, devsyConfig, workspaceClient, reporter); err != nil {
return err
}

log.Debugf("running command in devcontainer: %s", strings.Join(cmd.RunCmd, " "))
Expand All @@ -269,21 +243,53 @@ func (cmd *CICmd) execute(ctx context.Context, source string) (err error) {
})
}

func (cmd *CICmd) loadConfig() (*config.Config, error) {
devsyConfig, err := config.LoadConfig(cmd.Context, cmd.Provider)
if err != nil {
return nil, err
}
if devsyConfig.ContextOption(config.ContextOptionSSHStrictHostKeyChecking) == config.BoolTrue {
cmd.StrictHostKeyChecking = true
}
return devsyConfig, nil
}

type resolvedWorkspace struct {
client client.BaseWorkspaceClient
cleanup func() error
teardown bool
}

func (r *resolvedWorkspace) release(reporter status.Reporter) error {
if !r.teardown {
return r.cleanup()
}
return status.Run(context.Background(), reporter, status.Operation{
Phase: status.PhaseDeletingWorkspace,
}, func(context.Context) error {
return r.cleanup()
})
}

// resolveWorkspace resolves (creating if needed) the workspace to run in.
func (cmd *CICmd) resolveWorkspace(
ctx context.Context,
devsyConfig *config.Config,
source string,
) (client.BaseWorkspaceClient, func() error, bool, error) {
) (*resolvedWorkspace, error) {
var args []string
if source != "" {
args = []string{source}
}
exists := workspace2.Exists(ctx, devsyConfig, args, "", cmd.Owner)
exists := workspace2.Exists(
ctx,
devsyConfig,
workspace2.LookupOptions{Args: args, Owner: cmd.Owner},
)

sshConfigPath, cleanupSSH, err := workspacecmd.NewTempSSHConfig()
if err != nil {
return nil, nil, false, err
return nil, err
}

workspaceClient, err := workspace2.Resolve(ctx, devsyConfig, workspace2.ResolveParams{
Expand All @@ -300,7 +306,7 @@ func (cmd *CICmd) resolveWorkspace(
})
if err != nil {
cleanupSSH()
return nil, nil, false, err
return nil, err
}

teardown := exists == "" && !cmd.Keep
Expand All @@ -311,7 +317,7 @@ func (cmd *CICmd) resolveWorkspace(
}
return nil
}
return workspaceClient, cleanup, teardown, nil
return &resolvedWorkspace{client: workspaceClient, cleanup: cleanup, teardown: teardown}, nil
}

// runInContainer runs the command inside the started container.
Expand Down Expand Up @@ -344,3 +350,31 @@ func (cmd *CICmd) validateEnv() error {
}
return nil
}

// startWorkspace brings up the workspace for the CI command and waits for the
// post-create phase.
func (cmd *CICmd) startWorkspace(
ctx context.Context,
devsyConfig *config.Config,
workspaceClient client.BaseWorkspaceClient,
reporter status.Reporter,
) error {
if _, ok := workspaceClient.(client.WorkspaceClient); !ok {
return fmt.Errorf("ci is currently not supported for proxy providers")
}

cmd.WaitFor = string(setup.PhasePostCreate)

if _, err := up.RunHeadless(ctx, workspaceClient, up.HeadlessOptions{
GlobalFlags: cmd.GlobalFlags,
DevsyConfig: devsyConfig,
CLIOptions: cmd.CLIOptions,
Reporter: reporter,
ProviderOptions: cmd.ProviderOptions,
SecretsFile: cmd.SecretsFile,
FeatureSecretsFile: cmd.FeatureSecretsFile,
}); err != nil {
return fmt.Errorf("start devcontainer: %w", err)
}
return nil
}
51 changes: 29 additions & 22 deletions cmd/completion/suggestions.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ func RegisterFlagCompletionFuns(rootCmd *cobra.Command, globalFlags *flags.Globa
func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
return GetProviderSuggestions(
rootCmd,
globalFlags.Context,
globalFlags.Provider,
args,
toComplete,
globalFlags.Owner,
SuggestionRequest{
Context: globalFlags.Context,
Provider: globalFlags.Provider,
Args: args,
ToComplete: toComplete,
Owner: globalFlags.Owner,
},
)
},
); err != nil {
Expand All @@ -33,11 +35,13 @@ func RegisterFlagCompletionFuns(rootCmd *cobra.Command, globalFlags *flags.Globa
func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
return GetContextSuggestions(
rootCmd,
globalFlags.Context,
globalFlags.Provider,
args,
toComplete,
globalFlags.Owner,
SuggestionRequest{
Context: globalFlags.Context,
Provider: globalFlags.Provider,
Args: args,
ToComplete: toComplete,
Owner: globalFlags.Owner,
},
)
},
); err != nil {
Expand All @@ -47,13 +51,20 @@ func RegisterFlagCompletionFuns(rootCmd *cobra.Command, globalFlags *flags.Globa
return nil
}

// SuggestionRequest carries the inputs of the completion helpers.
type SuggestionRequest struct {
Context string
Provider string
Args []string
ToComplete string
Owner platform.OwnerFilter
}

func GetWorkspaceSuggestions(
rootCmd *cobra.Command,
context, provider string,
args []string,
toComplete string,
owner platform.OwnerFilter,
req SuggestionRequest,
) ([]string, cobra.ShellCompDirective) {
context, provider, toComplete, owner := req.Context, req.Provider, req.ToComplete, req.Owner
devsyConfig, err := config.LoadConfig(context, provider)
if err != nil {
return nil, cobra.ShellCompDirectiveError
Expand All @@ -75,11 +86,9 @@ func GetWorkspaceSuggestions(

func GetProviderSuggestions(
rootCmd *cobra.Command,
context, provider string,
args []string,
toComplete string,
owner platform.OwnerFilter,
req SuggestionRequest,
) ([]string, cobra.ShellCompDirective) {
context, provider, toComplete := req.Context, req.Provider, req.ToComplete
devsyConfig, err := config.LoadConfig(context, provider)
if err != nil {
return nil, cobra.ShellCompDirectiveError
Expand All @@ -101,11 +110,9 @@ func GetProviderSuggestions(

func GetContextSuggestions(
rootCmd *cobra.Command,
context, provider string,
args []string,
toComplete string,
owner platform.OwnerFilter,
req SuggestionRequest,
) ([]string, cobra.ShellCompDirective) {
context, provider, toComplete := req.Context, req.Provider, req.ToComplete
devsyConfig, err := config.LoadConfig(context, provider)
if err != nil {
return nil, cobra.ShellCompDirectiveError
Expand Down
59 changes: 39 additions & 20 deletions cmd/config/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/devsy-org/devsy/pkg/status"
"github.com/devsy-org/devsy/pkg/types"
pkgworkspace "github.com/devsy-org/devsy/pkg/workspace"
"github.com/devsy-org/devsy/pkg/workspacelogs"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -111,8 +112,30 @@ func (cmd *ApplyCmd) Run(ctx context.Context) error {
EnvArgs: envArgs,
Workdir: workdir,
User: devcconfig.GetRemoteUser(result),
Recorder: workspacelogs.RecorderFrom(ctx),
}

if err := cmd.runLifecycle(ctx, reporter, params, result); err != nil {
return err
}

log.Debugf("apply completed for container %s", containerDetails.ID)
if emitJSON {
return devcconfig.WriteResultJSON(os.Stdout, devcconfig.ResultEnvelope{
ContainerID: containerDetails.ID,
RemoteUser: devcconfig.GetRemoteUser(result),
RemoteWorkspaceFolder: workdir,
})
}
return nil
}

func (cmd *ApplyCmd) runLifecycle(
ctx context.Context,
reporter status.Reporter,
params *workspace.LifecycleExecParams,
result *devcconfig.Result,
) error {
if err := status.Run(
ctx,
reporter,
Expand All @@ -123,26 +146,14 @@ func (cmd *ApplyCmd) Run(ctx context.Context) error {
); err != nil {
return err
}
if err := status.Run(
return status.Run(
ctx,
reporter,
status.Operation{Phase: status.PhaseReady},
func(context.Context) error {
return nil
},
); err != nil {
return err
}

log.Debugf("apply completed for container %s", containerDetails.ID)
if emitJSON {
return devcconfig.WriteResultJSON(os.Stdout, devcconfig.ResultEnvelope{
ContainerID: containerDetails.ID,
RemoteUser: devcconfig.GetRemoteUser(result),
RemoteWorkspaceFolder: workdir,
})
}
return nil
)
}

func (cmd *ApplyCmd) resolveContainer(
Expand Down Expand Up @@ -333,8 +344,7 @@ func (cmd *ApplyCmd) installFeatures(
if err := cmd.copyAndExecFeatures(
ctx,
helper,
featureSets,
featureStageDir,
featureStage{featureSets: featureSets, dir: featureStageDir},
emitJSON,
); err != nil {
return err
Expand All @@ -359,13 +369,20 @@ func (cmd *ApplyCmd) resolveFeatureSets(
return featureSets, nil
}

// featureStage is the feature set to copy into the container and the local
// folder it is staged in.
type featureStage struct {
featureSets []*devcconfig.FeatureSet
dir string
}

func (cmd *ApplyCmd) copyAndExecFeatures(
ctx context.Context,
helper *docker.DockerHelper,
featureSets []*devcconfig.FeatureSet,
featureStageDir string,
stage featureStage,
emitJSON bool,
) error {
featureSets, featureStageDir := stage.featureSets, stage.dir
containerFeaturesPath := "/tmp/build-features"
streams := docker.Streams{Stdout: os.Stdout, Stderr: os.Stderr}
if emitJSON {
Expand Down Expand Up @@ -466,8 +483,10 @@ func (cmd *ApplyCmd) runApplyLifecycleHooks(
}

for _, hook := range hooks {
for _, h := range hook.cmds {
if err := workspace.ExecLifecycleHook(params, hook.name, h); err != nil {
for i, h := range hook.cmds {
indexed := *params
indexed.HookIndex = i
if err := workspace.ExecLifecycleHook(&indexed, hook.name, h); err != nil {
return fmt.Errorf("lifecycle hooks: %s: %w", hook.name, err)
}
}
Expand Down
3 changes: 2 additions & 1 deletion cmd/context/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"os"
"sort"
"strconv"

Expand Down Expand Up @@ -83,7 +84,7 @@ func (cmd *ListCmd) Run(ctx context.Context) error {
if err != nil {
return err
}
fmt.Print(string(out))
_, _ = fmt.Fprint(os.Stdout, string(out))
}

return nil
Expand Down
Loading
Loading