fix timeout

Author: christianalfoni

package-lock.json

@@ -69,6 +69,7 @@
     "@hey-api/openapi-ts": "^0.63.2",
     "@msgpack/msgpack": "^3.1.0",
     "@types/blessed": "^0.1.25",
+    "@types/node": "^22.15.30",
     "@types/react": "^19.1.5",
     "@types/yargs": "^17.0.33",
     "blessed": "^0.1.81",
@@ -89,16 +90,16 @@
     "yargs": "^17.7.2"
   },
   "dependencies": {
+    "@codesandbox/pitcher-protocol": "0.360.4",
     "@inkjs/ui": "^2.0.0",
     "@tanstack/react-query": "^5.76.1",
-    "isbinaryfile": "^5.0.4",
     "ink": "^5.2.1",
-    "react": "^18.3.1",
-    "@codesandbox/pitcher-protocol": "0.360.4",
+    "isbinaryfile": "^5.0.4",
     "ora": "^8.2.0",
     "path": "^0.12.7",
+    "react": "^18.3.1",
     "readline": "^1.3.0",
-    "ws": "^8.18.2",
-    "util": "^0.12.5"
+    "util": "^0.12.5",
+    "ws": "^8.18.2"
   }
 }

package.json

@@ -150,10 +150,7 @@ export class Sandbox {
     }
 
     return customSession.git
-      ? {
-          ...customSession.env,
-          GIT_CONFIG: "$HOME/private/.gitconfig",
-        }
+      ? { GIT_CONFIG: "$HOME/private/.gitconfig", ...customSession.env }
       : customSession.env;
   }
 
@@ -216,6 +213,8 @@ export class Sandbox {
           `[user]
     name  = ${customSession.git.name || customSession.id}
     email = ${customSession.git.email}
+[init]
+    defaultBranch = main
 [credential]
     helper = store --file ~/private/.gitcredentials`,
           {

src/Sandbox.ts

@@ -32,27 +32,48 @@ export async function startVm(
   sandboxId: string,
   startOpts?: StartSandboxOpts
 ): Promise<PitcherManagerResponse> {
-  const startResult = await vmStart({
-    client: apiClient,
-    body: startOpts
-      ? {
-          ipcountry: startOpts.ipcountry,
-          tier: startOpts.vmTier?.name,
-          hibernation_timeout_seconds: startOpts.hibernationTimeoutSeconds,
-          automatic_wakeup_config: startOpts.automaticWakeupConfig,
-        }
-      : undefined,
-    path: {
-      id: sandboxId,
-    },
-  });
+  // 2 minutes is the configuration for the API and Manager
+  const TIMEOUT_SECONDS = 120;
+  const controller = new AbortController();
+  const signal = controller.signal;
+  const timeoutHandle = setTimeout(() => {
+    controller.abort();
+  }, TIMEOUT_SECONDS * 1000);
+
+  try {
+    const startResult = await vmStart({
+      client: apiClient,
+      body: startOpts
+        ? {
+            ipcountry: startOpts.ipcountry,
+            tier: startOpts.vmTier?.name,
+            hibernation_timeout_seconds: startOpts.hibernationTimeoutSeconds,
+            automatic_wakeup_config: startOpts.automaticWakeupConfig,
+          }
+        : undefined,
+      path: {
+        id: sandboxId,
+      },
+      signal,
+    });
 
-  const response = handleResponse(
-    startResult,
-    `Failed to start sandbox ${sandboxId}`
-  );
+    const response = handleResponse(
+      startResult,
+      `Failed to start sandbox ${sandboxId}`
+    );
 
-  return getStartResponse(response);
+    return getStartResponse(response);
+  } catch (err) {
+    if (err instanceof Error && err.name === "AbortError") {
+      throw new Error(
+        `Request took longer than ${TIMEOUT_SECONDS}s, so we aborted.`
+      );
+    }
+
+    throw err;
+  } finally {
+    clearTimeout(timeoutHandle);
+  }
 }
 
 /**

src/Sandboxes.ts

@@ -55,13 +55,15 @@ export class Commands {
     let commandWithEnv = Object.keys(allEnv).length
       ? `env ${Object.entries(allEnv)
           .map(([key, value]) => `${key}=${value}`)
-          .join(" ")} ${command}`
+          .join(" ")} bash -c '${command}'`
       : command;
 
     if (opts?.cwd) {
       commandWithEnv = `cd ${opts.cwd} && ${commandWithEnv}`;
     }
 
+    console.log("WTF", commandWithEnv);
+
     const shell = await this.agentClient.shells.create(
       this.agentClient.workspacePath,
       opts?.dimensions ?? DEFAULT_SHELL_SIZE,