Merge branch 'main' into feat/action-space-v2

Author: yuyutaotao

packages/web-integration/src/playground/server.ts

@@ -28,7 +28,8 @@ const setup = async () => {
     const { parsed } = dotenv.config();
 
     if (parsed) {
-      overrideAIConfig(parsed);
+      // Use extendMode to merge with existing config instead of replacing it
+      overrideAIConfig(parsed, true);
     }
   }
 };

packages/web-integration/tests/ai/web/static/static-page.test.ts

@@ -3,8 +3,7 @@ import { join } from 'node:path';
 import { StaticPageAgent } from '@/playground/agent';
 import PlaygroundServer from '@/playground/server';
 import StaticPage from '@/playground/static-page';
-import { allConfigFromEnv } from '@midscene/shared/env';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 const dumpFilePath = join(__dirname, '../../fixtures/ui-context.json');
 const context = readFileSync(dumpFilePath, { encoding: 'utf-8' });
@@ -34,17 +33,8 @@ describe(
     });
 
     it('server should work', async () => {
-      // Save current config before creating server
-      const currentConfig = (globalThis as any).midsceneGlobalConfig;
-      
       server = new PlaygroundServer(StaticPage, StaticPageAgent);
 
-      // Restore config after server creation in case it was cleared
-      if (!(globalThis as any).midsceneGlobalConfig || 
-          Object.keys((globalThis as any).midsceneGlobalConfig || {}).length === 0) {
-        (globalThis as any).midsceneGlobalConfig = currentConfig || allConfigFromEnv();
-      }
-      
       await server.launch();
 
       const port = server.port;