Skip to content

feat(BREV-2866): open shell in expected container working directory #308

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

Open
nisolanki1209 wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −3
Open

feat(BREV-2866): open shell in expected container working directory #308

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1e9237
feat(BREV-2866): open shell in expected container working directory
nisolanki1209 Mar 4, 2026
f2209a4
feat(BREV-2866): preserve login shell environment
nisolanki1209 Mar 4, 2026
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
12 changes: 9 additions & 3 deletions pkg/cmd/shell/shell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func runShellCommand(t *terminal.Terminal, sstore ShellStore, workspaceNameOrID
// legacy environments wont support this and cause errrors,
// but we don't want to block the user from using the shell
_ = writeconnectionevent.WriteWCEOnEnv(sstore, workspace.DNS)
err = runSSH(sshName)
err = runSSH(sshName, host)
if err != nil {
return breverrors.WrapAndTrace(err)
}
Expand All @@ -144,9 +144,15 @@ func runShellCommand(t *terminal.Terminal, sstore ShellStore, workspaceNameOrID
return nil
}

func runSSH(sshAlias string) error {
func runSSH(sshAlias string, host bool) error {
sshAgentEval := "eval $(ssh-agent -s)"
cmd := fmt.Sprintf("%s && ssh %s", sshAgentEval, sshAlias)
var cmd string
if host {
cmd = fmt.Sprintf("%s && ssh %s", sshAgentEval, sshAlias)
} else {
// SSH into VM and respect container WORKDIR if containerized, otherwise use default directory
cmd = fmt.Sprintf("%s && ssh -t %s 'DIR=$(readlink -f /proc/1/cwd 2>/dev/null || pwd); cd \"$DIR\" || echo \"Warning: Could not access container directory\" >&2; exec -l ${SHELL:-/bin/sh}'", sshAgentEval, sshAlias)
}

sshCmd := exec.Command("bash", "-c", cmd) //nolint:gosec //cmd is user input
sshCmd.Stderr = os.Stderr
Expand Down
Loading