refactor(cli): consolidate internal command tree layout

cmd/internal/agent.go

@@ -0,0 +1,66 @@
+package cmdinternal
+
+import (
+	"os"
+
+	"github.com/devsy-org/devsy/cmd/flags"
+	"github.com/devsy-org/devsy/cmd/internal/agentcontainer"
+	"github.com/devsy-org/devsy/cmd/internal/agentworkspace"
+	"github.com/devsy-org/devsy/pkg/config"
+	"github.com/devsy-org/devsy/pkg/envfile"
+	"github.com/devsy-org/devsy/pkg/log"
+	"github.com/spf13/cobra"
+)
+
+var AgentExecutedAnnotation = "devsy.sh/agent-executed"
+
+// NewAgentCmd is the hidden parent for commands that run inside a workspace or
+// container, invoked by the daemon over the agent tunnel.
+func NewAgentCmd(globalFlags *flags.GlobalFlags) *cobra.Command {
+	agentCmd := &cobra.Command{
+		Use:               "agent",
+		Short:             "Devsy Agent",
+		PersistentPreRunE: agentPreRunE(globalFlags),
+		Hidden:            true,
+	}
+
+	agentCmd.AddCommand(agentworkspace.NewWorkspaceCmd(globalFlags))
+	agentCmd.AddCommand(agentcontainer.NewContainerCmd(globalFlags))
+	agentCmd.AddCommand(NewDaemonCmd(globalFlags))
+	agentCmd.AddCommand(NewContainerTunnelCmd(globalFlags))
+	agentCmd.AddCommand(NewGitCredentialsCmd(globalFlags))
+	agentCmd.AddCommand(NewGitSSHSignatureCmd(globalFlags))
+	agentCmd.AddCommand(NewGitSSHSignatureHelperCmd(globalFlags))
+	agentCmd.AddCommand(NewDockerCredentialsCmd(globalFlags))
+	return agentCmd
+}
+
+// agentPreRunE builds the PersistentPreRunE shared by the agent command and the
+// utility plumbing commands. Logging is forced to JSON because the agent
+// subprocess uses stdout as a binary protocol channel, so log output must stay
+// on stderr as single-line JSON captured by TunnelLogStreamer.lastLines.
+func agentPreRunE(globalFlags *flags.GlobalFlags) func(*cobra.Command, []string) error {
+	return func(cobraCmd *cobra.Command, _ []string) error {
+		root := cobraCmd
+		for root.Parent() != nil {
+			root = root.Parent()
+		}
+		if root.Annotations == nil {
+			root.Annotations = map[string]string{}
+		}
+		root.Annotations[AgentExecutedAnnotation] = "true"
+
+		log.Init(log.Config{
+			Quiet:  globalFlags.Quiet,
+			Debug:  globalFlags.Debug,
+			Format: "json",
+		})
+
+		if globalFlags.DevsyHome != "" {
+			_ = os.Setenv(config.EnvHome, globalFlags.DevsyHome)
+		}
+
+		envfile.Apply()
+		return nil
+	}
+}

cmd/agent/daemon.go → cmd/internal/agent_daemon.go

@@ -1,4 +1,4 @@
-package agent
+package cmdinternal
 
 import (
 	"bytes"

cmd/agent/docker_credentials.go → cmd/internal/agent_docker_credentials.go

@@ -1,4 +1,4 @@
-package agent
+package cmdinternal
 
 import (
 	"context"

cmd/agent/container/codeserver_async.go → cmd/internal/agentcontainer/codeserver_async.go

@@ -1,4 +1,4 @@
-package container
+package agentcontainer
 
 import (
 	"encoding/json"

cmd/agent/container/container.go → cmd/internal/agentcontainer/container.go

@@ -1,4 +1,4 @@
-package container
+package agentcontainer
 
 import (
 	"github.com/devsy-org/devsy/cmd/flags"

cmd/agent/container/credentials_server.go → cmd/internal/agentcontainer/credentials_server.go

@@ -1,4 +1,4 @@
-package container
+package agentcontainer
 
 import (
 	"context"

cmd/agent/container/daemon.go → cmd/internal/agentcontainer/daemon.go

@@ -1,4 +1,4 @@
-package container
+package agentcontainer
 
 import (
 	"context"

cmd/agent/container/deferred_hooks.go → cmd/internal/agentcontainer/deferred_hooks.go

@@ -1,6 +1,6 @@
 //go:build !windows
 
-package container
+package agentcontainer
 
 import (
 	"context"

cmd/agent/container/deferred_hooks_windows.go → cmd/internal/agentcontainer/deferred_hooks_windows.go

@@ -1,6 +1,6 @@
 //go:build windows
 
-package container
+package agentcontainer
 
 import (
 	"fmt"

cmd/agent/container/openvscode_async.go → cmd/internal/agentcontainer/openvscode_async.go

@@ -1,4 +1,4 @@
-package container
+package agentcontainer
 
 import (
 	"encoding/json"

cmd/agent/container/post_attach.go → cmd/internal/agentcontainer/post_attach.go

@@ -1,6 +1,6 @@
 //go:build !windows
 
-package container
+package agentcontainer
 
 import (
 	"context"

cmd/agent/container/post_attach_windows.go → cmd/internal/agentcontainer/post_attach_windows.go

@@ -1,6 +1,6 @@
 //go:build windows
 
-package container
+package agentcontainer
 
 import (
 	"fmt"

cmd/agent/container/setup.go → cmd/internal/agentcontainer/setup.go

@@ -1,6 +1,6 @@
 //go:build !windows
 
-package container
+package agentcontainer
 
 import (
 	"context"

cmd/agent/container/setup_devsy_platform_access.go → cmd/internal/agentcontainer/setup_devsy_platform_access.go

@@ -1,4 +1,4 @@
-package container
+package agentcontainer
 
 import (
 	"fmt"

cmd/agent/container/setup_internal_test.go → cmd/internal/agentcontainer/setup_internal_test.go

@@ -1,6 +1,6 @@
 //go:build !windows
 
-package container
+package agentcontainer
 
 import (
 	"encoding/json"

cmd/agent/container/setup_windows.go → cmd/internal/agentcontainer/setup_windows.go

@@ -1,6 +1,6 @@
 //go:build windows
 
-package container
+package agentcontainer
 
 import (
 	"fmt"

cmd/agent/container/ssh_server.go → cmd/internal/agentcontainer/ssh_server.go

@@ -1,11 +1,11 @@
-package container
+package agentcontainer
 
 import (
 	"fmt"
 
 	"github.com/devsy-org/devsy/cmd/flags"
 	"github.com/devsy-org/devsy/pkg/log"
-	helperssh "github.com/devsy-org/devsy/pkg/ssh/server"
+	sshserver "github.com/devsy-org/devsy/pkg/ssh/server"
 	"github.com/devsy-org/devsy/pkg/ssh/server/port"
 	"github.com/spf13/cobra"
 )
@@ -32,7 +32,7 @@ func NewSSHServerCmd(flags *flags.GlobalFlags) *cobra.Command {
 	}
 
 	sshCmd.Flags().
-		StringVar(&cmd.Address, "address", fmt.Sprintf("127.0.0.1:%d", helperssh.DefaultUserPort), "Address to listen to")
+		StringVar(&cmd.Address, "address", fmt.Sprintf("127.0.0.1:%d", sshserver.DefaultUserPort), "Address to listen to")
 	sshCmd.Flags().
 		StringVar(&cmd.RemoteUser, "remote-user", "", "The remote user for this workspace")
 	sshCmd.Flags().
@@ -42,7 +42,7 @@ func NewSSHServerCmd(flags *flags.GlobalFlags) *cobra.Command {
 
 // Run runs the command logic.
 func (cmd *SSHServerCmd) Run(_ *cobra.Command, _ []string) error {
-	server, err := helperssh.NewContainerServer(cmd.Address, cmd.Workdir)
+	server, err := sshserver.NewContainerServer(cmd.Address, cmd.Workdir)
 	if err != nil {
 		return err
 	}

cmd/agent/container/vscode_async.go → cmd/internal/agentcontainer/vscode_async.go

@@ -1,4 +1,4 @@
-package container
+package agentcontainer
 
 import (
 	"encoding/json"

cmd/agent/workspace/build.go → cmd/internal/agentworkspace/build.go

@@ -1,4 +1,4 @@
-package workspace
+package agentworkspace
 
 import (
 	"context"

cmd/agent/workspace/clean.go → cmd/internal/agentworkspace/clean.go

@@ -1,4 +1,4 @@
-package workspace
+package agentworkspace
 
 import (
 	"context"

cmd/agent/workspace/clean_test.go → cmd/internal/agentworkspace/clean_test.go

@@ -1,4 +1,4 @@
-package workspace
+package agentworkspace
 
 import (
 	"context"