testdriverai 7.9.56-test → 7.9.58-test

package/mcp-server/src/env-utils.ts

@@ -0,0 +1,77 @@
+/**
+ * Utilities for resolving TestDriver environment variables.
+ *
+ * These helpers centralise the "param > env var > default" fallback logic
+ * so the server handler stays clean and the logic can be unit-tested
+ * independently.
+ */
+
+// ============================================================
+// OS resolution
+// ============================================================
+
+const VALID_OS_VALUES = ["linux", "windows"] as const;
+export type SandboxOs = (typeof VALID_OS_VALUES)[number];
+
+/**
+ * Resolve the sandbox OS with the following priority:
+ *   1. Explicit `os` parameter passed to session_start
+ *   2. `TD_OS` environment variable (validated against supported values)
+ *   3. `"linux"` default
+ *
+ * Mirrors the behaviour in `hooks.mjs` so the MCP server and the
+ * Vitest integration are consistent.
+ *
+ * @param explicitOs - The value passed explicitly by the caller (may be undefined)
+ * @param env        - The environment variables map (defaults to `process.env`)
+ * @returns          - The resolved OS and a warning message if TD_OS was invalid
+ */
+export function resolveOs(
+  explicitOs: SandboxOs | undefined,
+  env: NodeJS.ProcessEnv = process.env,
+): { os: SandboxOs; warning?: string } {
+  if (explicitOs) {
+    return { os: explicitOs };
+  }
+
+  const envOs = env.TD_OS;
+  if (envOs) {
+    if ((VALID_OS_VALUES as readonly string[]).includes(envOs)) {
+      return { os: envOs as SandboxOs };
+    }
+    return {
+      os: "linux",
+      warning: `TD_OS has unsupported value "${envOs}" (supported: ${VALID_OS_VALUES.join(", ")}), ignoring`,
+    };
+  }
+
+  return { os: "linux" };
+}
+
+// ============================================================
+// E2B template ID resolution
+// ============================================================
+
+/**
+ * Resolve the E2B template ID with the following priority:
+ *   1. Explicit `e2bTemplateId` parameter passed to session_start
+ *   2. `TD_E2B_TEMPLATE_ID` environment variable
+ *   3. `undefined` (let the SDK use its own default)
+ *
+ * Mirrors the behaviour in `hooks.mjs`:
+ *   ```js
+ *   if (!config.e2bTemplateId && process.env.TD_E2B_TEMPLATE_ID) {
+ *     config.e2bTemplateId = process.env.TD_E2B_TEMPLATE_ID;
+ *   }
+ *   ```
+ *
+ * @param explicitId - The value passed explicitly by the caller (may be undefined)
+ * @param env        - The environment variables map (defaults to `process.env`)
+ * @returns          - The resolved template ID, or undefined if none is set
+ */
+export function resolveE2bTemplateId(
+  explicitId: string | undefined,
+  env: NodeJS.ProcessEnv = process.env,
+): string | undefined {
+  return explicitId || env.TD_E2B_TEMPLATE_ID;
+}

package/mcp-server/src/provision-types.ts

@@ -143,7 +143,7 @@ export const SessionStartInputSchema = z.object({
   
   // Common session options
   /** Operating system for the sandbox */
-  os: z.enum(["linux", "windows"]).default("linux").describe("Sandbox OS"),
+  os: z.enum(["linux", "windows"]).optional().describe("Sandbox OS (default: 'linux', or TD_OS environment variable if set)"),
   /** Keep sandbox alive duration in ms (default: 5 minutes) */
   keepAlive: z.number().default(300000).describe("Keep sandbox alive for this many ms"),
   /** Path to test file - when provided, you MUST append generated code to this file after each action */
@@ -157,6 +157,9 @@ export const SessionStartInputSchema = z.object({
   /** Direct IP address of self-hosted instance (bypasses cloud provisioning) */
   ip: z.string().optional().describe("Direct IP address of self-hosted Windows instance (e.g., from AWS). When provided, connects directly to this IP instead of using cloud provisioning."),
   
+  /** E2B sandbox template ID (overrides TD_E2B_TEMPLATE_ID env var) */
+  e2bTemplateId: z.string().optional().describe("E2B sandbox template ID. Overrides the TD_E2B_TEMPLATE_ID environment variable when provided."),
+  
   // Debug mode - connect to existing sandbox
   /** Sandbox ID to connect to (for debug-on-failure mode). When provided, connects to an existing sandbox instead of creating a new one. Skip provisioning. */
   sandboxId: z.string().optional().describe("Existing sandbox ID to connect to (from debug-on-failure mode). Skips provisioning."),

package/mcp-server/src/server.ts

@@ -22,6 +22,7 @@ import { fileURLToPath, pathToFileURL } from "url";
 import { z } from "zod";
 
 import { generateActionCode } from "./codegen.js";
+import { resolveE2bTemplateId, resolveOs } from "./env-utils.js";
 import { getProvisionOptions, SessionStartInputSchema, type SessionStartInput } from "./provision-types.js";
 import { sessionManager, type SessionState } from "./session.js";
 
@@ -525,10 +526,27 @@ Debug mode (connect to existing sandbox):
   },
   async (params: SessionStartInput): Promise<CallToolResult> => {
     const startTime = Date.now();
+
+    // Resolve OS with priority: explicit param > TD_OS env var > "linux" default
+    // This mirrors the behavior of the Vitest hooks (hooks.mjs) which also reads TD_OS
+    const { os: resolvedOs, warning: osWarning } = resolveOs(params.os);
+    if (osWarning) {
+      logger.warn(`session_start: ${osWarning}`);
+    } else if (!params.os && resolvedOs !== "linux") {
+      logger.info("session_start: Using TD_OS environment variable", { os: resolvedOs });
+    }
+
+    // Resolve E2B template ID with priority: explicit param > TD_E2B_TEMPLATE_ID env var
+    // This mirrors the behavior of the Vitest hooks (hooks.mjs) which also reads TD_E2B_TEMPLATE_ID
+    const resolvedE2bTemplateId = resolveE2bTemplateId(params.e2bTemplateId);
+    if (!params.e2bTemplateId && resolvedE2bTemplateId) {
+      logger.info("session_start: Using TD_E2B_TEMPLATE_ID environment variable", { e2bTemplateId: resolvedE2bTemplateId });
+    }
+
     logger.info("session_start: Starting", { 
       type: params.type, 
       url: params.url,
-      os: params.os, 
+      os: resolvedOs, 
       reconnect: params.reconnect,
       sandboxId: params.sandboxId,
     });
@@ -546,7 +564,7 @@ Debug mode (connect to existing sandbox):
 
       // Create new session
       const newSession = sessionManager.createSession({
-        os: params.os,
+        os: resolvedOs,
         keepAlive: params.keepAlive,
         testFile: params.testFile,
       });
@@ -592,11 +610,12 @@ Debug mode (connect to existing sandbox):
       });
       
       sdk = new TestDriverSDK(apiKey, {
-        os: params.os,
+        os: resolvedOs,
         logging: false,
         apiRoot,
         preview: previewMode as "browser" | "ide" | "none",
         ip: instanceIp,
+        e2bTemplateId: resolvedE2bTemplateId,
       });
 
       // Handle sandboxId mode - connect to existing sandbox (debug-on-failure mode)

package/mcp-server/tsconfig.json

@@ -12,5 +12,5 @@
     "resolveJsonModule": true
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist", "src/mcp-app.ts", "src/mcp-app.css"]
+  "exclude": ["node_modules", "dist", "src/mcp-app.ts", "src/mcp-app.css", "src/**/*.test.ts"]
 }

package/mcp-server/vitest.config.ts

@@ -0,0 +1,7 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    include: ["src/**/*.test.ts"],
+  },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testdriverai",
-  "version": "7.9.56-test",
+  "version": "7.9.58-test",
   "description": "Next generation autonomous AI agent for end-to-end testing of web & desktop",
   "main": "sdk.js",
   "types": "sdk.d.ts",