diff --git a/scripts/e2e.config.ts b/scripts/e2e.config.ts index b3fd86e879..4df70aeed0 100644 --- a/scripts/e2e.config.ts +++ b/scripts/e2e.config.ts @@ -18,7 +18,7 @@ const resolved = await Effect.gen(function* () { const path = yield* Path.Path; const env = yield* HostProcess.Environment; const scripts = yield* path.fromFileUrl(new URL(".", import.meta.url)); - const home = path.resolve(scripts, "../.t3/scenarios"); + const home = path.resolve(scripts, "../.t3/scenarios-" + path.basename(env.T3_SCENARIO_APP_DIR ?? "current")); // A pooled device reaches this machine over the tailnet, not localhost. const host = yield* run("tailscale", ["ip", "-4"]).pipe( Effect.map((result) => result.stdout.trim().split("\n")[0] ?? ""), diff --git a/scripts/scenarios/start-app.ts b/scripts/scenarios/start-app.ts index c22d692528..870ec4c1c7 100644 --- a/scripts/scenarios/start-app.ts +++ b/scripts/scenarios/start-app.ts @@ -77,16 +77,16 @@ export const prepareHome = Effect.fn("startApp.prepareHome")(function* (home: st path.join(home, "userdata/settings.json"), yield* encodeSettings({ defaultModelSelection: REPLAY, - providerInstances: Object.fromEntries( + providerInstances: { registryRecovery: {driver: "acpRegistry", displayName: "Registry recovery", enabled: true, config: {source: "registry", agentId: "opencode", commandPath: "/usr/local/bin/opencode"}}, ...Object.fromEntries( REAL_PROVIDERS.map((driver) => [ driver, { driver, enabled: false, - ...(driver === "codex" ? { config: { binaryPath: noModel } } : {}), + ...(driver === "codex" ? { config: { binaryPath: "/bin/false" } } : {}), }, ]), - ), + )}, }), ); }); @@ -132,9 +132,24 @@ const startApp = Effect.fn("startApp")(function* (input: { const node = yield* HostProcess.ExecutablePath; const checkout = yield* HostProcess.WorkingDirectory; const hostEnvironment = yield* HostProcess.Environment; - yield* prepareHome(input.home); + if (hostEnvironment.ACP_RECOVERY_RESTART !== "1") yield* prepareHome(input.home); + const offlinePreload = path.join(input.home, "bin/offline.cjs"); + yield* fs.writeFileString(offlinePreload, `const dns = require("node:dns"); +const original = dns.lookup; +dns.lookup = function(host, ...args) { + if (host === "cdn.agentclientprotocol.com") { + const cb = args.at(-1); + const error = Object.assign(new Error("Registry endpoint intentionally offline"), {code:"ENOTFOUND"}); + process.stderr.write("Registry network blocked\\n"); + queueMicrotask(() => cb(error)); + return; + } + return original.call(this, host, ...args); +}; +`); const env = { ...hostEnvironment, + ...(hostEnvironment.ACP_RECOVERY_OFFLINE === "1" ? {NODE_OPTIONS: "--require " + offlinePreload} : {}), PATH: `${path.join(input.home, "bin")}:${hostEnvironment.PATH ?? ""}`, T3CODE_AUTO_BOOTSTRAP_PROJECT_FROM_CWD: "0", };