diff --git a/agent/agent.go b/agent/agent.go
index bd8aca9..00fae6a 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -266,6 +266,9 @@ func (ag *Agent) SetSessionEnv(sessionID string) {
 			if ag.id != "" {
 				es.SetEnv("OLLIE_UNAME", ag.id)
 			}
+			if u := os.Getenv("USER"); u != "" {
+				es.SetEnv("USER", u)
+			}
 		}
 	}
 }
diff --git a/toolsrv/shell.go b/toolsrv/shell.go
index 23dc347..ca9af4e 100644
--- a/toolsrv/shell.go
+++ b/toolsrv/shell.go
@@ -516,6 +516,10 @@ func (e *Server) executeWithStdin(ctx context.Context, code, language string, ti
 		cmd.Env = append(cmd.Env, k+"="+v)
 	}
 	e.envMu.RUnlock()
+	// Export computed NAMESPACE so tools like ollie-9p can find the server.
+	if ns := envMap["NAMESPACE"]; ns != "" {
+		cmd.Env = append(cmd.Env, "NAMESPACE="+ns)
+	}
 
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 	cmd.Cancel = func() error {