diff --git a/scripts/e2e.config.ts b/scripts/e2e.config.ts
index 520fc8338d..5319ac2804 100644
--- a/scripts/e2e.config.ts
+++ b/scripts/e2e.config.ts
@@ -180,6 +180,8 @@ export default {
   workers: 1,
   timeout: 300_000,
   assertionTimeout: 15_000,
+  actionTimeout: 120_000,
+  cleanupTimeout: 120_000,
   video: "on",
   trace: "on",
   reporters: ["list", "markdown"],
diff --git a/scripts/scenarios/start-app.ts b/scripts/scenarios/start-app.ts
index 5dee3f26c1..47297100ef 100644
--- a/scripts/scenarios/start-app.ts
+++ b/scripts/scenarios/start-app.ts
@@ -66,6 +66,9 @@ const prepareHome = Effect.fn("startApp.prepareHome")(function* (home: string) {
   const noModel = path.join(home, "bin/no-model");
   yield* fs.writeFileString(noModel, "#!/bin/sh\necho 'scenarios run no model' >&2\nexit 1\n");
   yield* fs.chmod(noModel, 0o755);
+  const catalogProbe = path.join(home, "bin/catalog-probe");
+  yield* fs.writeFileString(catalogProbe, "#!/bin/sh\nif [ \"$1\" = \"--version\" ]; then echo \"2.1.300 (Claude Code)\"; exit 0; fi\nexit 1\n");
+  yield* fs.chmod(catalogProbe, 0o755);
   yield* fs.writeFileString(
     path.join(home, "userdata/settings.json"),
     yield* encodeSettings({
@@ -75,8 +78,8 @@ const prepareHome = Effect.fn("startApp.prepareHome")(function* (home: string) {
           driver,
           {
             driver,
-            enabled: false,
-            ...(driver === "codex" ? { config: { binaryPath: noModel } } : {}),
+            enabled: driver === "claudeAgent",
+            ...(driver === "codex" ? { config: { binaryPath: noModel } } : driver === "claudeAgent" ? { config: { binaryPath: catalogProbe } } : {}),
           },
         ]),
       ),