finally git and env working

Author: christianalfoni

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codesandbox/sdk",
-  "version": "2.0.0-rc.11",
+  "version": "2.0.0-rc.10-debug",
   "description": "The CodeSandbox SDK",
   "author": "CodeSandbox",
   "license": "MIT",

src/Sandbox.ts

@@ -88,10 +88,6 @@ export class Sandbox {
     customSession: SessionCreateOptions,
     session: SandboxSession
   ) {
-    if (!customSession.git && !customSession.env) {
-      return;
-    }
-
     const client = await connectToSandbox({
       session,
       getSession: async () =>
@@ -100,9 +96,18 @@ export class Sandbox {
 
     if (customSession.env) {
       const envStrings = Object.entries(customSession.env)
-        .map(([key, value]) => `export ${key}=${value}`)
+        .map(([key, value]) => {
+          // escape any single-quotes in the value
+          const safe = value.replace(/'/g, `'\\"'`);
+          return `export ${key}='${safe}'`;
+        })
         .join("\n");
-      await client.commands.run(`echo "${envStrings}" > $HOME/.private/.env`);
+      const cmd = [
+        `cat << 'EOF' > "$HOME/.private/.env"`,
+        envStrings,
+        `EOF`,
+      ].join("\n");
+      await client.commands.run(cmd);
     }
 
     if (customSession.git) {
@@ -155,13 +160,6 @@ export class Sandbox {
       body: {
         session_id: customSession.id,
         permission: customSession.permission ?? "write",
-        ...(customSession.git
-          ? {
-              git_access_token: customSession.git.accessToken,
-              git_user_email: customSession.git.email,
-              git_user_name: customSession.git.name,
-            }
-          : {}),
       },
       path: {
         id: this.id,
@@ -225,16 +223,20 @@ export class Sandbox {
   async createSession(
     customSession?: SessionCreateOptions
   ): Promise<SandboxSession> {
-    const session = await this.getSession(
-      this.pitcherManagerResponse,
-      customSession
-    );
-
-    if (customSession) {
-      const client = await this.initializeCustomSession(customSession, session);
-      client?.disconnect();
+    if (customSession?.git || customSession?.env) {
+      const configureSession = await this.getSession(
+        this.pitcherManagerResponse,
+        customSession
+      );
+
+      const client = await this.initializeCustomSession(
+        customSession,
+        configureSession
+      );
+
+      client?.dispose();
     }
 
-    return session;
+    return this.getSession(this.pitcherManagerResponse, customSession);
   }
 }

src/SandboxClient/commands.ts

@@ -48,16 +48,18 @@ export class Commands {
 
     command = Array.isArray(command) ? command.join(" && ") : command;
 
-    const allEnv = Object.assign(opts?.env ?? {});
+    const passedEnv = Object.assign(opts?.env ?? {});
+
+    const escapedCommand = command.replace(/'/g, "'\\''");
 
     // TODO: use a new shell API that natively supports cwd & env
-    let commandWithEnv = Object.keys(allEnv).length
+    let commandWithEnv = Object.keys(passedEnv).length
       ? `source $HOME/.private/.env 2>/dev/null || true && env ${Object.entries(
-          allEnv
+          passedEnv
         )
           .map(([key, value]) => `${key}=${value}`)
-          .join(" ")} bash -c '${command}'`
-      : `source $HOME/.private/.env 2>/dev/null || true && ${command}`;
+          .join(" ")} bash -c '${escapedCommand}'`
+      : `source $HOME/.private/.env 2>/dev/null || true && bash -c '${escapedCommand}'`;
 
     if (opts?.cwd) {
       commandWithEnv = `cd ${opts.cwd} && ${commandWithEnv}`;

src/bin/commands/build.ts

@@ -236,7 +236,9 @@ export const buildCommand: yargs.CommandModule<
 
           await waitForSetup(session, index);
 
-          spinner.start(updateSpinnerMessage(index, "Creating fork state..."));
+          spinner.start(
+            updateSpinnerMessage(index, "Optimizing initial state...")
+          );
           sandboxVM = await withCustomError(
             sdk.sandboxes.restart(id, {
               vmTier: sandboxTier,