fix: improve script handling in execute commands for better serialization

.github/workflows/_ci-e2e-tauri-all-providers.reusable.yml

@@ -428,8 +428,12 @@ jobs:
           echo "Cleaning up before CrabNebula provider tests..."
           if [ "${{ runner.os }}" == "Windows" ]; then
             powershell -Command "Get-Process -Name 'tauri-e2e-app' -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue" || true
+            powershell -Command "Get-Process -Name 'test-runner-backend' -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue" || true
+            powershell -Command "Get-Process -Name 'tauri-driver' -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue" || true
           else
             pkill -9 -f tauri-e2e-app || true
+            pkill -9 -f test-runner-backend || true
+            pkill -9 -f tauri-driver || true
           fi
 
       - name: 🧪 E2E Tests [CrabNebula]
@@ -457,8 +461,12 @@ jobs:
           echo "Cleaning up after CrabNebula provider tests..."
           if [ "${{ runner.os }}" == "Windows" ]; then
             powershell -Command "Get-Process -Name 'tauri-e2e-app' -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue" || true
+            powershell -Command "Get-Process -Name 'test-runner-backend' -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue" || true
+            powershell -Command "Get-Process -Name 'tauri-driver' -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue" || true
           else
             pkill -9 -f tauri-e2e-app || true
+            pkill -9 -f test-runner-backend || true
+            pkill -9 -f tauri-driver || true
           fi
 
       - name: 🐛 Debug Information [CrabNebula]

docs/tauri-playwright-improvements-plan.md

@@ -13,7 +13,7 @@
 | 2 | Direct WebView eval channel (supplement WebDriver) | Tauri (embedded) | Large | High | Pending |
 | 3 | Multi-window label configuration | Tauri | Small | Medium | **Completed** |
 | 4 | Native screenshot capture | Tauri + Electron | Medium | Low | Pending |
-| 5 | Audit JS string interpolation / escaping | Tauri + Electron | Small | Medium | Pending |
+| 5 | Audit JS string interpolation / escaping | Tauri + Electron | Small | Medium | **Done** |
 | 6 | IPC mock serialization pattern | Tauri + Electron | Medium | Medium | Pending |
 
 ---

e2e/test/electron/api.spec.ts

@@ -83,6 +83,56 @@ describe('Electron APIs', () => {
       );
     });
 
+    describe('execute - different script types', () => {
+      it('should execute function with args (with-args branch)', async () => {
+        const result = await browser.electron.execute(
+          (electron, arg1, arg2) => {
+            return { appName: electron.app.getName(), arg1, arg2 };
+          },
+          'first',
+          'second',
+        );
+        expect(result.appName).toBeDefined();
+        expect(result.arg1).toBe('first');
+        expect(result.arg2).toBe('second');
+      });
+
+      it('should execute statement-style string (return statement)', async () => {
+        const result = await browser.electron.execute('return 42');
+        expect(result).toBe(42);
+      });
+
+      it('should execute expression-style string', async () => {
+        const result = await browser.electron.execute('1 + 2 + 3');
+        expect(result).toBe(6);
+      });
+
+      it('should execute string with variable declaration', async () => {
+        const result = await browser.electron.execute(`
+          const x = 10;
+          const y = 20;
+          return x + y;
+        `);
+        expect(result).toBe(30);
+      });
+
+      it('should execute function without args', async () => {
+        const result = await browser.electron.execute((electron) => {
+          return { name: electron.app.getName() };
+        });
+        expect(result.name).toBeDefined();
+      });
+
+      it('should execute async function with args', async () => {
+        const result = await browser.electron.execute(async (electron, value) => {
+          await new Promise((resolve) => setTimeout(resolve, 10));
+          return { received: value, appName: electron.app.getName() };
+        }, 'async-test');
+        expect(result.received).toBe('async-test');
+        expect(result.appName).toBeDefined();
+      });
+    });
+
     describe('workaround for TSX issue', () => {
       // Tests for the following issue - can be removed when the TSX issue is resolved
       // https://github.com/webdriverio-community/wdio-electron-service/issues/756

e2e/test/tauri/api.spec.ts

@@ -23,4 +23,67 @@ describe('Tauri API', () => {
     expect(result).toHaveProperty('os');
     expect(typeof result.os).toBe('string');
   });
+
+  describe('execute - different script types', () => {
+    it('should execute function with Tauri APIs and args (with-args branch)', async () => {
+      // This tests the with-args branch: function receives Tauri APIs as first param, user args after
+      const result = await browser.tauri.execute(
+        (tauri, arg1, arg2) => {
+          return { tauriHasCore: typeof tauri?.core?.invoke === 'function', arg1, arg2 };
+        },
+        'first',
+        'second',
+      );
+      expect(result.tauriHasCore).toBe(true);
+      expect(result.arg1).toBe('first');
+      expect(result.arg2).toBe('second');
+    });
+
+    it('should execute statement-style string (return statement)', async () => {
+      // This tests the no-args branch with statement-style script like "return document.title"
+      const result = await browser.tauri.execute('return 42');
+      expect(result).toBe(42);
+    });
+
+    it('should execute expression-style string', async () => {
+      // This tests the no-args branch with expression-style script
+      const result = await browser.tauri.execute('1 + 2 + 3');
+      expect(result).toBe(6);
+    });
+
+    it('should execute string with variable declaration', async () => {
+      // Statement-style: declare variables and return
+      const result = await browser.tauri.execute(`
+        const x = 10;
+        const y = 20;
+        return x + y;
+      `);
+      expect(result).toBe(30);
+    });
+
+    it('should execute function with Tauri APIs (no args)', async () => {
+      // Function without args should still receive Tauri APIs
+      const result = await browser.tauri.execute((tauri) => {
+        return { hasCore: typeof tauri?.core !== 'undefined' };
+      });
+      expect(result.hasCore).toBe(true);
+    });
+
+    it('should execute string that accesses Tauri APIs', async () => {
+      // String script that uses window.__TAURI__ directly
+      const result = await browser.tauri.execute(`
+        return typeof window.__TAURI__?.core;
+      `);
+      expect(result).toBe('object');
+    });
+
+    it('should execute async function with args', async () => {
+      const result = await browser.tauri.execute(async (tauri, value) => {
+        await new Promise((resolve) => setTimeout(resolve, 10));
+        return { received: value, hasTauri: !!tauri?.core };
+      }, 'async-test');
+      expect(result.received).toBe('async-test');
+      expect(result.hasTauri).toBe(true);
+    });
+  });
 });

package.json

@@ -31,12 +31,12 @@
     "e2e": "pnpm --filter @repo/e2e run test",
     "e2e:electron-builder": "pnpm protocol-install:electron-builder && pnpm --filter @repo/e2e run test:e2e:electron-builder",
     "e2e:electron-forge": "pnpm protocol-install:electron-forge && pnpm --filter @repo/e2e run test:e2e:electron-forge",
-    "e2e:multiremote": "pnpm --filter @repo/e2e run test:e2e:multiremote",
     "e2e:electron-script": "pnpm --filter @repo/e2e run test:e2e:electron-script",
+    "e2e:multiremote": "pnpm --filter @repo/e2e run test:e2e:multiremote",
     "e2e:standalone": "pnpm --filter @repo/e2e run test:e2e:standalone",
-    "e2e:window": "pnpm --filter @repo/e2e run test:e2e:window",
     "e2e:tauri": "pnpm protocol-install:tauri && pnpm --filter @repo/e2e run test:e2e:tauri",
     "e2e:tauri-basic": "pnpm protocol-install:tauri && pnpm --filter @repo/e2e run test:e2e:tauri-basic",
+    "e2e:window": "pnpm --filter @repo/e2e run test:e2e:window",
     "protocol-install:tauri": "pnpm --filter @repo/e2e run protocol-install:tauri",
     "protocol-install:electron-builder": "pnpm --filter @repo/e2e run protocol-install:electron-builder",
     "protocol-install:electron-forge": "pnpm --filter @repo/e2e run protocol-install:electron-forge",

packages/electron-cdp-bridge/package.json

@@ -56,11 +56,7 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.18"
   },
-  "files": [
-    "dist",
-    "README.md",
-    "LICENSE"
-  ],
+  "files": ["dist", "README.md", "LICENSE"],
   "publishConfig": {
     "access": "public",
     "provenance": true