Merge pull request #225 from ProverCoderAI/codex/shared-browser-agent-isolation

[codex] fix browser session isolation defaults

Author: skulidropek

.github/actions/setup/action.yml

@@ -24,8 +24,19 @@ runs:
     - name: Install OpenSSH client
       shell: bash
       run: |
-        sudo apt-get update
-        sudo apt-get install -y openssh-client
+        for attempt in 1 2 3; do
+          sudo rm -rf /var/lib/apt/lists/*
+          if sudo apt-get -o Acquire::Retries=3 -o Acquire::By-Hash=force update; then
+            break
+          fi
+          if [[ "$attempt" == "3" ]]; then
+            echo "apt-get update failed after retries" >&2
+            exit 1
+          fi
+          echo "apt-get update attempt ${attempt} failed; retrying..." >&2
+          sleep $((attempt * 2))
+        done
+        sudo apt-get -o Acquire::Retries=3 install -y openssh-client
     - name: Install node-gyp
       shell: bash
       run: npm install -g node-gyp

.github/workflows/check.yml

@@ -100,7 +100,7 @@ jobs:
   e2e-opencode:
     name: E2E (OpenCode)
     runs-on: ubuntu-latest
-    timeout-minutes: 25
+    timeout-minutes: 40
     steps:
       - uses: actions/checkout@v6
       - name: Install dependencies
@@ -113,7 +113,7 @@ jobs:
   e2e-clone-cache:
     name: E2E (Clone cache)
     runs-on: ubuntu-latest
-    timeout-minutes: 25
+    timeout-minutes: 40
     steps:
       - uses: actions/checkout@v6
       - name: Install dependencies
@@ -126,7 +126,7 @@ jobs:
   e2e-login-context:
     name: E2E (Login context)
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 40
     steps:
       - uses: actions/checkout@v6
       - name: Install dependencies
@@ -139,7 +139,7 @@ jobs:
   e2e-runtime-volumes-ssh:
     name: E2E (Runtime volumes + SSH)
     runs-on: ubuntu-latest
-    timeout-minutes: 25
+    timeout-minutes: 40
     steps:
       - uses: actions/checkout@v6
       - name: Install dependencies
@@ -152,7 +152,7 @@ jobs:
   e2e-clone-auto-open-ssh:
     name: E2E (Clone auto-open SSH)
     runs-on: ubuntu-latest
-    timeout-minutes: 25
+    timeout-minutes: 40
     steps:
       - uses: actions/checkout@v6
       - name: Install dependencies

packages/api/Dockerfile

@@ -9,7 +9,24 @@ ENV BUN_INSTALL=/opt/bun
 ENV PATH=/opt/bun/bin:$PATH
 WORKDIR /workspace
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN set -eu; \
+  sed -i \
+    -e 's|http://archive.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g' \
+    -e 's|http://security.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g' \
+    /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources 2>/dev/null || true; \
+  for attempt in 1 2 3; do \
+    rm -rf /var/lib/apt/lists/*; \
+    if apt-get -o Acquire::Retries=3 -o Acquire::By-Hash=force update; then \
+      break; \
+    fi; \
+    if [ "$attempt" = "3" ]; then \
+      echo "apt-get update failed after retries" >&2; \
+      exit 1; \
+    fi; \
+    echo "apt-get update attempt ${attempt} failed; retrying..." >&2; \
+    sleep $((attempt * 2)); \
+  done; \
+  apt-get -o Acquire::Retries=3 install -y --no-install-recommends \
     ca-certificates curl git docker.io docker-compose-v2 openssh-client sshpass python3 make g++ unzip \
  && rm -rf /var/lib/apt/lists/*
 

packages/api/src/program.ts

@@ -11,12 +11,20 @@ import { attachProjectBrowserWebSocketServer } from "./services/project-browser.
 import { attachProjectDatabaseWebSocketServer } from "./services/project-databases.js"
 import { attachTerminalWebSocketServer } from "./services/terminal-sessions.js"
 
+type ApiHttpServer = ReturnType<typeof createServer>
+
 const resolvePort = (env: Record<string, string | undefined>): number => {
   const raw = env["DOCKER_GIT_API_PORT"] ?? env["PORT"]
   const parsed = raw === undefined ? Number.NaN : Number(raw)
   return Number.isFinite(parsed) && parsed > 0 ? parsed : 3334
 }
 
+export const configureLongRunningRequestTimeouts = (server: ApiHttpServer): ApiHttpServer => {
+  server.requestTimeout = 0
+  server.setTimeout(0)
+  return server
+}
+
 const requestLogger = HttpMiddleware.make((httpApp) =>
   Effect.gen(function*(_) {
     const request = yield* _(HttpServerRequest.HttpServerRequest)
@@ -45,7 +53,7 @@ export const program = (() => {
   const port = resolvePort(process.env)
   const router = makeRouter()
   const app = router.pipe(HttpServer.serve(requestLogger), HttpServer.withLogAddress)
-  const server = createServer()
+  const server = configureLongRunningRequestTimeouts(createServer())
   attachAuthTerminalWebSocketServer(server)
   attachTerminalWebSocketServer(server)
   attachProjectBrowserWebSocketServer(server)

packages/api/src/services/agents.ts

@@ -55,18 +55,18 @@ const sourceLabel = (request: CreateAgentRequest): string =>
 
 const pickDefaultCommand = (provider: CreateAgentRequest["provider"]): string => {
   if (provider === "codex") {
-    return "codex"
+    return "MCP_PLAYWRIGHT_ISOLATED=1 codex"
   }
   if (provider === "opencode") {
     return "opencode"
   }
   if (provider === "claude") {
-    return "claude"
+    return "MCP_PLAYWRIGHT_ISOLATED=1 claude"
   }
   return ""
 }
 
-const buildCommand = (request: CreateAgentRequest): string => {
+export const buildCommand = (request: CreateAgentRequest): string => {
   const direct = request.command?.trim() ?? ""
   if (direct.length > 0) {
     return direct

packages/api/tests/agents.test.ts

@@ -0,0 +1,23 @@
+import { describe, expect, it } from "vitest"
+
+import { buildCommand } from "../src/services/agents.js"
+
+describe("agent service", () => {
+  it("starts default Codex agents with isolated Playwright MCP", () => {
+    expect(buildCommand({ provider: "codex" })).toBe("MCP_PLAYWRIGHT_ISOLATED=1 codex")
+    expect(buildCommand({ provider: "codex", args: ["exec", "hello world"] })).toBe(
+      "MCP_PLAYWRIGHT_ISOLATED=1 codex 'exec' 'hello world'"
+    )
+  })
+
+  it("starts default Claude agents with isolated Playwright MCP", () => {
+    expect(buildCommand({ provider: "claude" })).toBe("MCP_PLAYWRIGHT_ISOLATED=1 claude")
+    expect(buildCommand({ provider: "claude", args: ["-p", "hello world"] })).toBe(
+      "MCP_PLAYWRIGHT_ISOLATED=1 claude '-p' 'hello world'"
+    )
+  })
+
+  it("does not rewrite custom agent commands", () => {
+    expect(buildCommand({ provider: "codex", command: "codex --help" })).toBe("codex --help")
+  })
+})

packages/api/tests/program.test.ts

@@ -0,0 +1,14 @@
+import { createServer } from "node:http"
+
+import { describe, expect, it } from "vitest"
+
+import { configureLongRunningRequestTimeouts } from "../src/program.js"
+
+describe("api program", () => {
+  it("does not abort long-running project creation requests", () => {
+    const server = configureLongRunningRequestTimeouts(createServer())
+
+    expect(server.requestTimeout).toBe(0)
+    expect(server.timeout).toBe(0)
+  })
+})

packages/app/src/docker-git/api-http.ts

@@ -1,6 +1,7 @@
 import type { HttpClientResponse } from "@effect/platform"
-import { FetchHttpClient, HttpBody, HttpClient } from "@effect/platform"
+import { HttpBody, HttpClient } from "@effect/platform"
 import type * as HttpClientError from "@effect/platform/HttpClientError"
+import { NodeHttpClient } from "@effect/platform-node"
 import { Effect } from "effect"
 
 import { readHttpResponseTextStream } from "../shared/http-response-stream.js"
@@ -140,16 +141,19 @@ const executeRequestWithControllerRetry = (
   body: JsonRequest | undefined
 ) => {
   const execute = () => executeRequest(client, resolveApiBaseUrl(), method, path, body)
+  const shouldRetry = method === "GET"
 
   return execute().pipe(
     Effect.matchEffect({
       onFailure: (error) =>
-        ensureControllerReady().pipe(
-          Effect.matchEffect({
-            onFailure: () => Effect.fail(error),
-            onSuccess: () => execute()
-          })
-        ),
+        !shouldRetry
+          ? Effect.fail(error)
+          : ensureControllerReady().pipe(
+            Effect.matchEffect({
+              onFailure: () => Effect.fail(error),
+              onSuccess: () => execute()
+            })
+          ),
       onSuccess: (value) => Effect.succeed(value)
     })
   )
@@ -198,7 +202,7 @@ export const request = (
     }
 
     return parsed
-  }).pipe(Effect.provide(FetchHttpClient.layer), mapTransportError(method, path))
+  }).pipe(Effect.provide(NodeHttpClient.layer), mapTransportError(method, path))
 
 export const requestVoid = (method: ApiHttpMethod, path: string, body?: JsonRequest) =>
   request(method, path, body).pipe(Effect.asVoid)
@@ -219,4 +223,4 @@ export const requestTextStream = (
     }
 
     return yield* _(readHttpResponseTextStream(response, onChunk))
-  }).pipe(Effect.provide(FetchHttpClient.layer), mapTransportError(method, path))
+  }).pipe(Effect.provide(NodeHttpClient.layer), mapTransportError(method, path))

packages/app/src/docker-git/cli/usage.ts

@@ -93,7 +93,7 @@ Container runtime env (set via .orch/env/project.env):
   DOCKER_GIT_ZSH_AUTOSUGGEST=1|0        Enable zsh-autosuggestions (default: 1)
   DOCKER_GIT_ZSH_AUTOSUGGEST_STYLE=...  zsh-autosuggestions highlight style (default: fg=8,italic)
   DOCKER_GIT_ZSH_AUTOSUGGEST_STRATEGY=...  Suggestion sources (default: history completion)
-  MCP_PLAYWRIGHT_ISOLATED=1|0           Isolated browser contexts (recommended for many Codex; default: 1)
+  MCP_PLAYWRIGHT_ISOLATED=1|0           Isolated browser contexts; default 0 shares the VNC session
   MCP_PLAYWRIGHT_CDP_GUARD=1|0          Guard CDP so MCP cannot close/crash shared Chromium (default: 1)
   MCP_PLAYWRIGHT_BLOCK_BROWSER_CLOSE=1|0  Block destructive Browser.close/crash CDP methods (default: 1)
   MCP_PLAYWRIGHT_CDP_ENDPOINT=http://...  Override CDP endpoint (default: http://dg-<repo>-browser:9223)

packages/app/src/lib/core/templates-entrypoint/agent.ts

@@ -52,8 +52,13 @@ fi`
 
 const renderAgentPromptCommand = (mode: AgentMode): string =>
   Match.value(mode).pipe(
-    Match.when("claude", () => String.raw`claude --dangerously-skip-permissions -p \"\$(cat \"$AGENT_PROMPT_FILE\")\"`),
-    Match.when("codex", () => String.raw`codex exec \"\$(cat \"$AGENT_PROMPT_FILE\")\"`),
+    Match.when(
+      "claude",
+      () =>
+        String
+          .raw`MCP_PLAYWRIGHT_ISOLATED=1 claude --dangerously-skip-permissions -p \"\$(cat \"$AGENT_PROMPT_FILE\")\"`
+    ),
+    Match.when("codex", () => String.raw`MCP_PLAYWRIGHT_ISOLATED=1 codex exec \"\$(cat \"$AGENT_PROMPT_FILE\")\"`),
     Match.when("gemini", () => String.raw`gemini --approval-mode=yolo \"\$(cat \"$AGENT_PROMPT_FILE\")\"`),
     Match.exhaustive
   )