Revert "[RFC][direnv-inspired] introduce export and hook commands, use in devbox shell, global and direnv (#1172)"

This reverts commit 9e3638f.

Author: savil

devbox.go

@@ -21,7 +21,6 @@ type Devbox interface {
 	// Adding duplicate packages is a no-op.
 	Add(ctx context.Context, pkgs ...string) error
 	Config() *devconfig.Config
-	ExportHook(shellName string) (string, error)
 	ProjectDir() string
 	// Generate creates the directory of Nix files and the Dockerfile that define
 	// the devbox environment.

internal/boxcli/export.go

@@ -26,7 +26,6 @@ func globalCmd() *cobra.Command {
 	}
 
 	addCommandAndHideConfigFlag(globalCmd, addCmd())
-	addCommandAndHideConfigFlag(globalCmd, hookCmd())
 	addCommandAndHideConfigFlag(globalCmd, installCmd())
 	addCommandAndHideConfigFlag(globalCmd, pathCmd())
 	addCommandAndHideConfigFlag(globalCmd, pullCmd())
@@ -113,10 +112,7 @@ func setGlobalConfigForDelegatedCommands(
 }
 
 func ensureGlobalEnvEnabled(cmd *cobra.Command, args []string) error {
-	// Skip checking this for shellenv and hook sub-commands of devbox global
-	// since these commands are what will enable the global environment when
-	// invoked from the user's shellrc
-	if cmd.Name() == "shellenv" || cmd.Name() == "hook" {
+	if cmd.Name() == "shellenv" {
 		return nil
 	}
 	path, err := ensureGlobalConfig(cmd)

internal/boxcli/featureflag/prompt_hook.go

@@ -53,10 +53,8 @@ func RootCmd() *cobra.Command {
 		command.AddCommand(authCmd())
 	}
 	command.AddCommand(createCmd())
-	command.AddCommand(exportCmd())
 	command.AddCommand(generateCmd())
 	command.AddCommand(globalCmd())
-	command.AddCommand(hookCmd())
 	command.AddCommand(infoCmd())
 	command.AddCommand(initCmd())
 	command.AddCommand(installCmd())

internal/boxcli/global.go

@@ -36,14 +36,6 @@ func shellEnvCmd() *cobra.Command {
 		},
 	}
 
-	registerShellEnvFlags(command, &flags)
-	command.AddCommand(shellEnvOnlyPathWithoutWrappersCmd())
-
-	return command
-}
-
-func registerShellEnvFlags(command *cobra.Command, flags *shellEnvCmdFlags) {
-
 	command.Flags().BoolVar(
 		&flags.runInitHook, "init-hook", false, "runs init hook after exporting shell environment")
 	command.Flags().BoolVar(
@@ -53,6 +45,10 @@ func registerShellEnvFlags(command *cobra.Command, flags *shellEnvCmdFlags) {
 		&flags.pure, "pure", false, "If this flag is specified, devbox creates an isolated environment inheriting almost no variables from the current environment. A few variables, in particular HOME, USER and DISPLAY, are retained.")
 
 	flags.config.register(command)
+
+	command.AddCommand(shellEnvOnlyPathWithoutWrappersCmd())
+
+	return command
 }
 
 func shellEnvFunc(cmd *cobra.Command, flags shellEnvCmdFlags) (string, error) {

internal/boxcli/hook.go

@@ -817,23 +817,21 @@ func (d *Devbox) computeNixEnv(ctx context.Context, usePrintDevEnvCache bool) (m
 
 	addEnvIfNotPreviouslySetByDevbox(env, pluginEnv)
 
-	envPaths := []string{}
-	if !featureflag.PromptHook.Enabled() {
+	env["PATH"] = JoinPathLists(
 		// Prepend the bin-wrappers directory to the PATH. This ensures that
 		// bin-wrappers execute before the unwrapped binaries.
-		envPaths = append(envPaths, filepath.Join(d.projectDir, plugin.WrapperBinPath))
-	}
-	// Adding profile bin path is a temporary hack. Some packages .e.g. curl
-	// don't export the correct bin in the package, instead they export
-	// as a propagated build input. This can be fixed in 2 ways:
-	// * have NixBins() recursively look for bins in propagated build inputs
-	// * Turn existing planners into flakes (i.e. php, haskell) and use the bins
-	// in the profile.
-	// Landau: I prefer option 2 because it doesn't require us to re-implement
-	// nix recursive bin lookup.
-	envPaths = append(envPaths, nix.ProfileBinPath(d.projectDir), env["PATH"])
-
-	env["PATH"] = JoinPathLists(envPaths...)
+		filepath.Join(d.projectDir, plugin.WrapperBinPath),
+		// Adding profile bin path is a temporary hack. Some packages .e.g. curl
+		// don't export the correct bin in the package, instead they export
+		// as a propagated build input. This can be fixed in 2 ways:
+		// * have NixBins() recursively look for bins in propagated build inputs
+		// * Turn existing planners into flakes (i.e. php, haskell) and use the bins
+		// in the profile.
+		// Landau: I prefer option 2 because it doesn't require us to re-implement
+		// nix recursive bin lookup.
+		nix.ProfileBinPath(d.projectDir),
+		env["PATH"],
+	)
 
 	// Include env variables in devbox.json
 	configEnv := d.configEnvs(env)

internal/boxcli/root.go

@@ -17,7 +17,6 @@ import (
 	"runtime/trace"
 	"strings"
 
-	"go.jetpack.io/devbox/internal/boxcli/featureflag"
 	"go.jetpack.io/devbox/internal/debug"
 )
 
@@ -160,9 +159,5 @@ func getDevcontainerContent(pkgs []string) *devcontainerObject {
 func EnvrcContent(w io.Writer) error {
 	tmplName := "envrcContent.tmpl"
 	t := template.Must(template.ParseFS(tmplFS, "tmpl/"+tmplName))
-	return t.Execute(w, struct {
-		PromptHookEnabled bool
-	}{
-		PromptHookEnabled: featureflag.PromptHook.Enabled(),
-	})
+	return t.Execute(w, nil)
 }

internal/boxcli/shellenv.go

@@ -1,9 +1,5 @@
 use_devbox() {
     watch_file devbox.json
-    {{ if .PromptHookEnabled }}
-    eval "$(devbox export --init-hook --install)"
-    {{ else }}
     eval "$(devbox shellenv --init-hook --install)"
-    {{ end }}
 }
 use devbox

internal/impl/devbox.go

@@ -17,8 +17,6 @@ import (
 
 	"github.com/alessio/shellescape"
 	"github.com/pkg/errors"
-	"go.jetpack.io/devbox/internal/boxcli/featureflag"
-	"go.jetpack.io/devbox/internal/shenv"
 	"go.jetpack.io/devbox/internal/telemetry"
 
 	"go.jetpack.io/devbox/internal/debug"
@@ -326,25 +324,21 @@ func (s *DevboxShell) writeDevboxShellrc() (path string, err error) {
 	}
 
 	err = tmpl.Execute(shellrcf, struct {
-		ProjectDir        string
-		OriginalInit      string
-		OriginalInitPath  string
-		HooksFilePath     string
-		ShellName         string
-		ShellStartTime    string
-		HistoryFile       string
-		ExportEnv         string
-		PromptHookEnabled bool
+		ProjectDir       string
+		OriginalInit     string
+		OriginalInitPath string
+		HooksFilePath    string
+		ShellStartTime   string
+		HistoryFile      string
+		ExportEnv        string
 	}{
-		ProjectDir:        s.projectDir,
-		OriginalInit:      string(bytes.TrimSpace(userShellrc)),
-		OriginalInitPath:  s.userShellrcPath,
-		HooksFilePath:     s.hooksFilePath,
-		ShellName:         string(s.name),
-		ShellStartTime:    telemetry.FormatShellStart(s.shellStartTime),
-		HistoryFile:       strings.TrimSpace(s.historyFile),
-		ExportEnv:         exportify(s.env),
-		PromptHookEnabled: featureflag.PromptHook.Enabled(),
+		ProjectDir:       s.projectDir,
+		OriginalInit:     string(bytes.TrimSpace(userShellrc)),
+		OriginalInitPath: s.userShellrcPath,
+		HooksFilePath:    s.hooksFilePath,
+		ShellStartTime:   telemetry.FormatShellStart(s.shellStartTime),
+		HistoryFile:      strings.TrimSpace(s.historyFile),
+		ExportEnv:        exportify(s.env),
 	})
 	if err != nil {
 		return "", fmt.Errorf("execute shellrc template: %v", err)
@@ -427,23 +421,3 @@ func filterPathList(pathList string, keep func(string) bool) string {
 	}
 	return strings.Join(filtered, string(filepath.ListSeparator))
 }
-
-func (d *Devbox) ExportHook(shellName string) (string, error) {
-	if !featureflag.PromptHook.Enabled() {
-		return "", nil
-	}
-
-	// TODO: use a single common "enum" for both shenv and DevboxShell
-	hookTemplate, err := shenv.DetectShell(shellName).Hook()
-	if err != nil {
-		return "", err
-	}
-
-	var buf bytes.Buffer
-	err = template.Must(template.New("hookTemplate").Parse(hookTemplate)).
-		Execute(&buf, struct{ ProjectDir string }{ProjectDir: d.projectDir})
-	if err != nil {
-		return "", errors.WithStack(err)
-	}
-	return buf.String(), nil
-}

internal/impl/generate/devcontainer_util.go

@@ -67,9 +67,3 @@ if ! type refresh >/dev/null 2>&1; then
   alias refresh='eval $(devbox shellenv)'
   export DEVBOX_REFRESH_ALIAS="refresh"
 fi
-
-{{- if .PromptHookEnabled }}
-# Ensure devbox shellenv is evaluated
-# TODO savil: how do I wrap ProjectDir in quotes?
-eval "$(devbox hook {{ .ShellName }} -c {{ .ProjectDir }})"
-{{ end }}

internal/impl/generate/tmpl/envrcContent.tmpl

@@ -70,8 +70,3 @@ if not type refresh >/dev/null 2>&1
     alias refresh='eval (devbox shellenv | string collect)'
     export DEVBOX_REFRESH_ALIAS="refresh"
 end
-
-{{ if .PromptHookEnabled }}
-# Ensure devbox shellenv is evaluated
-devbox hook fish -c "{{ .ProjectDir }}" | source
-{{ end }}

internal/impl/shell.go

@@ -11,7 +11,7 @@ const bashHook = `
 _devbox_hook() {
   local previous_exit_status=$?;
   trap -- '' SIGINT;
-  eval "$(devbox export --config {{ .ProjectDir }})";
+  eval "$(devbox shellenv --config {{ .ProjectDir }})";
   trap - SIGINT;
   return $previous_exit_status;
 };

internal/impl/shellrc.tmpl

@@ -12,7 +12,7 @@ var Fish Shell = fish{}
 
 const fishHook = `
 function __devbox_shellenv_eval --on-event fish_prompt;
-  devbox export --config {{ .ProjectDir }} | source;
+  devbox shellenv --config {{ .ProjectDir }} | source;
 end;
 `
 

internal/impl/shellrc_fish.tmpl

@@ -8,7 +8,7 @@ var Ksh Shell = ksh{}
 // um, this is ChatGPT writing it. I need to verify and test
 const kshHook = `
 _devbox_hook() {
-  eval "$(devbox export --config {{ .ProjectDir }})";
+  eval "$(devbox shellenv --config {{ .ProjectDir }})";
 }
 if [[ "$(typeset -f precmd)" != *"_devbox_hook"* ]]; then
   function precmd {

internal/shenv/shell_bash.go

@@ -12,7 +12,7 @@ const posixHook = `
 _devbox_hook() {
   local previous_exit_status=$?
   trap : INT
-  eval "$(devbox export --config {{ .ProjectDir }})"
+  eval "$(devbox shellenv --config {{ .ProjectDir }})"
   trap - INT
   return $previous_exit_status
 }

internal/shenv/shell_fish.go

@@ -9,7 +9,7 @@ var Zsh Shell = zsh{}
 const zshHook = `
 _devbox_hook() {
   trap -- '' SIGINT;
-  eval "$(devbox export --config {{ .ProjectDir }})";
+  eval "$(devbox shellenv --config {{ .ProjectDir }})";
   trap - SIGINT;
 }
 typeset -ag precmd_functions;