testdriverai 7.2.9 → 7.2.10

package/.github/workflows/testdriver.yml

@@ -34,3 +34,130 @@ jobs:
         name: test-results
         path: test-results/
         retention-days: 30
+
+    # Init command test - only runs on PRs, not on main/master
+    - name: Create test directory for init
+      if: github.event_name == 'pull_request'
+      run: |
+        mkdir -p /tmp/test-init-project
+        cd /tmp/test-init-project
+
+    - name: Run init command (skip prompts)
+      if: github.event_name == 'pull_request'
+      working-directory: /tmp/test-init-project
+      run: |
+        # Create .env with API key first to skip the prompt
+        echo "TD_API_KEY=${{ secrets.TD_API_KEY }}" > .env
+        
+        # Run init command using the CLI from the repo
+        node ${{ github.workspace }}/bin/testdriverai.js init
+      env:
+        TD_API_KEY: ${{ secrets.TD_API_KEY }}
+
+    - name: Verify project structure
+      if: github.event_name == 'pull_request'
+      working-directory: /tmp/test-init-project
+      run: |
+        echo "Checking generated files..."
+        
+        # Check for package.json
+        if [ ! -f "package.json" ]; then
+          echo "❌ package.json not found"
+          exit 1
+        fi
+        echo "✓ package.json exists"
+        
+        # Check for vitest config
+        if [ ! -f "vitest.config.js" ]; then
+          echo "❌ vitest.config.js not found"
+          exit 1
+        fi
+        echo "✓ vitest.config.js exists"
+        
+        # Check for test file
+        if [ ! -f "tests/example.test.js" ]; then
+          echo "❌ tests/example.test.js not found"
+          exit 1
+        fi
+        echo "✓ tests/example.test.js exists"
+        
+        # Check for .env file
+        if [ ! -f ".env" ]; then
+          echo "❌ .env not found"
+          exit 1
+        fi
+        echo "✓ .env exists"
+        
+        # Check for .gitignore
+        if [ ! -f ".gitignore" ]; then
+          echo "❌ .gitignore not found"
+          exit 1
+        fi
+        echo "✓ .gitignore exists"
+        
+        # Check for GitHub workflow
+        if [ ! -f ".github/workflows/testdriver.yml" ]; then
+          echo "❌ .github/workflows/testdriver.yml not found"
+          exit 1
+        fi
+        echo "✓ .github/workflows/testdriver.yml exists"
+
+    - name: Verify vitest config contents
+      if: github.event_name == 'pull_request'
+      working-directory: /tmp/test-init-project
+      run: |
+        echo "Checking vitest.config.js contents..."
+        
+        # Check for TestDriver reporter
+        if ! grep -q "TestDriver()" vitest.config.js; then
+          echo "❌ TestDriver reporter not found in vitest.config.js"
+          cat vitest.config.js
+          exit 1
+        fi
+        echo "✓ TestDriver reporter is configured"
+        
+        # Check for setupFiles
+        if ! grep -q "setupFiles.*testdriverai/vitest/setup" vitest.config.js; then
+          echo "❌ setupFiles not configured correctly"
+          cat vitest.config.js
+          exit 1
+        fi
+        echo "✓ setupFiles is configured"
+
+    - name: Verify test file contents
+      if: github.event_name == 'pull_request'
+      working-directory: /tmp/test-init-project
+      run: |
+        echo "Checking test file contents..."
+        
+        # Check for .provision usage
+        if ! grep -q "\.provision\.chrome" tests/example.test.js; then
+          echo "❌ Test does not use .provision.chrome"
+          cat tests/example.test.js
+          exit 1
+        fi
+        echo "✓ Test uses .provision.chrome"
+        
+        # Check for TestDriver import
+        if ! grep -q "from 'testdriverai/vitest/hooks'" tests/example.test.js; then
+          echo "❌ Test does not import from testdriverai/vitest/hooks"
+          cat tests/example.test.js
+          exit 1
+        fi
+        echo "✓ Test imports TestDriver from vitest/hooks"
+
+    - name: Run the generated test
+      if: github.event_name == 'pull_request'
+      working-directory: /tmp/test-init-project
+      run: npm test
+      env:
+        TD_API_KEY: ${{ secrets.TD_API_KEY }}
+
+    - name: Upload init test results
+      if: always() && github.event_name == 'pull_request'
+      uses: actions/upload-artifact@v4
+      with:
+        name: test-init-results
+        path: /tmp/test-init-project/test-results/
+        retention-days: 7
+        if-no-files-found: warn

package/.testdriver/last-sandbox

@@ -0,0 +1,7 @@
+{
+  "sandboxId": "i-034317335b2eb9678",
+  "os": "windows",
+  "ami": null,
+  "instanceType": null,
+  "timestamp": "2025-12-22T23:09:20.319Z"
+}

package/agent/events.js

@@ -99,6 +99,7 @@ const events = {
     disconnect: "sandbox:disconnected",
     sent: "sandbox:sent",
     received: "sandbox:received",
+    progress: "sandbox:progress",
   },
   redraw: {
     status: "redraw:status",

package/agent/index.js

@@ -1619,49 +1619,35 @@ ${regression}
     this.emitter.emit(events.log.log, `${inputFile} (end)`);
   }
 
-  // Returns sandboxId to use (either from file if recent, or null)
-  getRecentSandboxId() {
-    const lastSandboxFile = path.join(
-      os.homedir(),
-      ".testdriverai-last-sandbox",
-    );
+  // Returns the path to the last sandbox file
+  getLastSandboxFilePath() {
+    const testdriverDir = path.join(process.cwd(), '.testdriver');
+    return path.join(testdriverDir, 'last-sandbox');
+  }
+
+  // Returns full sandbox info from last-sandbox file (no timeout - let API validate)
+  getLastSandboxId() {
+    const lastSandboxFile = this.getLastSandboxFilePath();
 
     if (fs.existsSync(lastSandboxFile)) {
       try {
-        const stats = fs.statSync(lastSandboxFile);
-        const mtime = new Date(stats.mtime);
-        const now = new Date();
-        const diffMinutes = (now - mtime) / (1000 * 60);
-        if (diffMinutes < 10) {
-          const fileContent = fs.readFileSync(lastSandboxFile, "utf-8").trim();
-
-          // Parse sandbox info (supports both old format and new format)
-          let sandboxInfo;
-          try {
-            sandboxInfo = JSON.parse(fileContent);
-          } catch {
-            return fileContent || null;
-          }
+        const fileContent = fs.readFileSync(lastSandboxFile, "utf-8").trim();
 
-          // Check if AMI and instance type match current requirements
-          const currentAmi = this.sandboxAmi || null;
-          const currentInstance = this.sandboxInstance || null;
-          const storedAmi = sandboxInfo.ami || null;
-          const storedInstance = sandboxInfo.instanceType || null;
-
-          if (currentAmi === storedAmi && currentInstance === storedInstance) {
-            // Return sandboxId (new format) or instanceId (old format for backwards compatibility)
-            return sandboxInfo.sandboxId || sandboxInfo.instanceId;
-          } else {
-            this.emitter.emit(
-              events.log.log,
-              theme.dim(
-                "Recent sandbox found but AMI/instance type doesn't match current requirements",
-              ),
-            );
-            return null;
-          }
+        // Parse sandbox info (supports both old format and new format)
+        let sandboxInfo;
+        try {
+          sandboxInfo = JSON.parse(fileContent);
+        } catch {
+          return { sandboxId: fileContent || null };
         }
+
+        return {
+          sandboxId: sandboxInfo.sandboxId || sandboxInfo.instanceId || null,
+          os: sandboxInfo.os || 'linux',
+          ami: sandboxInfo.ami || null,
+          instanceType: sandboxInfo.instanceType || null,
+          timestamp: sandboxInfo.timestamp || null,
+        };
       } catch {
         // ignore errors
       }
@@ -1669,12 +1655,43 @@ ${regression}
     return null;
   }
 
+  // Returns sandboxId to use if AMI/instance type match current requirements
+  getRecentSandboxId() {
+    const sandboxInfo = this.getLastSandboxId();
+    
+    if (!sandboxInfo || !sandboxInfo.sandboxId) {
+      return null;
+    }
+
+    // Check if AMI and instance type match current requirements
+    const currentAmi = this.sandboxAmi || null;
+    const currentInstance = this.sandboxInstance || null;
+    const storedAmi = sandboxInfo.ami || null;
+    const storedInstance = sandboxInfo.instanceType || null;
+
+    if (currentAmi === storedAmi && currentInstance === storedInstance) {
+      return sandboxInfo.sandboxId;
+    } else {
+      this.emitter.emit(
+        events.log.log,
+        theme.dim(
+          "Recent sandbox found but AMI/instance type doesn't match current requirements",
+        ),
+      );
+      return null;
+    }
+  }
+
   saveLastSandboxId(sandboxId, osType = "linux") {
-    const lastSandboxFile = path.join(
-      os.homedir(),
-      ".testdriverai-last-sandbox",
-    );
+    const lastSandboxFile = this.getLastSandboxFilePath();
+    const testdriverDir = path.dirname(lastSandboxFile);
+    
     try {
+      // Ensure .testdriver directory exists
+      if (!fs.existsSync(testdriverDir)) {
+        fs.mkdirSync(testdriverDir, { recursive: true });
+      }
+      
       const sandboxInfo = {
         sandboxId: sandboxId,
         os: osType,
@@ -1682,7 +1699,7 @@ ${regression}
         instanceType: this.sandboxInstance || null,
         timestamp: new Date().toISOString(),
       };
-      fs.writeFileSync(lastSandboxFile, JSON.stringify(sandboxInfo), {
+      fs.writeFileSync(lastSandboxFile, JSON.stringify(sandboxInfo, null, 2), {
         encoding: "utf-8",
       });
     } catch {
@@ -1691,10 +1708,7 @@ ${regression}
   }
 
   clearRecentSandboxId() {
-    const lastSandboxFile = path.join(
-      os.homedir(),
-      ".testdriverai-last-sandbox",
-    );
+    const lastSandboxFile = this.getLastSandboxFilePath();
     try {
       if (fs.existsSync(lastSandboxFile)) {
         fs.unlinkSync(lastSandboxFile);
@@ -1703,6 +1717,7 @@ ${regression}
       // ignore errors
     }
   }
+
   async buildEnv(options = {}) {
     // If instance already exists, do not build environment again
     if (this.instance) {
@@ -1785,6 +1800,7 @@ ${regression}
         let instance = await this.connectToSandboxDirect(
           this.sandboxId,
           true, // always persist by default
+          this.keepAlive, // pass keepAlive TTL
         );
 
         this.instance = instance;
@@ -1799,11 +1815,6 @@ ${regression}
         );
         console.error("Failed to reconnect to sandbox:", error);
       }
-    } else if (!createNew && !recentId) {
-      this.emitter.emit(
-        events.log.narration,
-        theme.dim(`no recent sandbox found, creating a new one.`),
-      );
     } else if (!createNew && this.sandboxId && !this.config.CI) {
       // Only attempt to connect to existing sandbox if not in CI mode and not creating new
       // Attempt to connect to known instance
@@ -1816,6 +1827,7 @@ ${regression}
         let instance = await this.connectToSandboxDirect(
           this.sandboxId,
           true, // always persist by default
+          this.keepAlive, // pass keepAlive TTL
         );
 
         this.instance = instance;
@@ -1858,6 +1870,7 @@ ${regression}
       let instance = await this.connectToSandboxDirect(
         this.sandboxId,
         true, // always persist by default
+        this.keepAlive, // pass keepAlive TTL
       );
       this.instance = instance;
       await this.renderSandbox(instance, headless);
@@ -2047,10 +2060,10 @@ Please check your network connection, TD_API_KEY, or the service status.`,
     }
   }
 
-  async connectToSandboxDirect(sandboxId, persist = false) {
+  async connectToSandboxDirect(sandboxId, persist = false, keepAlive = null) {
     const { formatter } = require("../sdk-log-formatter.js");
     this.emitter.emit(events.log.narration, formatter.getPrefix("connect") + " " + theme.green.bold("Connecting") + " " + theme.cyan(`to sandbox...`));
-    let reply = await this.sandbox.connect(sandboxId, persist);
+    let reply = await this.sandbox.connect(sandboxId, persist, keepAlive);
 
     // reply includes { success, url, sandbox: {...} }
     // For renderSandbox, we need the sandbox object with url merged in
@@ -2079,6 +2092,10 @@ Please check your network connection, TD_API_KEY, or the service status.`,
     if (this.sandboxInstance) {
       sandboxConfig.instanceType = this.sandboxInstance;
     }
+    // Add keepAlive TTL if specified
+    if (this.keepAlive !== undefined && this.keepAlive !== null) {
+      sandboxConfig.keepAlive = this.keepAlive;
+    }
 
     let instance = await this.sandbox.send(sandboxConfig, 60000 * 8);
 

package/agent/lib/sandbox.js

@@ -155,11 +155,12 @@ const createSandbox = (emitter, analytics, sessionInstance) => {
       }
     }
 
-    async connect(sandboxId, persist = false) {
+    async connect(sandboxId, persist = false, keepAlive = null) {
       let reply = await this.send({
         type: "connect",
         persist,
         sandboxId,
+        keepAlive,
       });
 
       if (reply.success) {
@@ -227,6 +228,15 @@ const createSandbox = (emitter, analytics, sessionInstance) => {
         this.socket.on("message", async (raw) => {
           let message = JSON.parse(raw);
 
+          // Handle progress messages (no requestId needed)
+          if (message.type === 'sandbox.progress') {
+            emitter.emit(events.sandbox.progress, {
+              step: message.step,
+              message: message.message,
+            });
+            return;
+          }
+
           if (!this.ps[message.requestId]) {
             console.warn(
               "No pending promise found for requestId:",