From f45d4a63455e60500a0eae206f2106449b93c550 Mon Sep 17 00:00:00 2001
From: Garry Tan <garrytan@gmail.com>
Date: Wed, 22 Jul 2026 10:52:28 -0700
Subject: [PATCH] test(eval): use withEnv() for ANTHROPIC_API_KEY mutation in
 longmemeval client test

check:test-isolation rule R1 flagged the manual process.env save/restore
in test/eval-longmemeval-client.test.ts. Wrap the gateway-routing test in
withEnv() (the canonical pattern) so restore is try/finally-safe too.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 test/eval-longmemeval-client.test.ts | 62 ++++++++++++++--------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/test/eval-longmemeval-client.test.ts b/test/eval-longmemeval-client.test.ts
index c7cc378b8..d7a82bde7 100644
--- a/test/eval-longmemeval-client.test.ts
+++ b/test/eval-longmemeval-client.test.ts
@@ -18,6 +18,7 @@ import {
   __setChatTransportForTests,
 } from '../src/core/ai/gateway.ts';
 import type { ChatOpts, ChatResult } from '../src/core/ai/gateway.ts';
+import { withEnv } from './helpers/with-env.ts';
 
 afterAll(() => {
   __setChatTransportForTests(null);
@@ -50,38 +51,35 @@ describe('buildLLMClient (#2099)', () => {
     const seen: string[] = [];
     // probeChatModel's Anthropic branch reads process.env (hasAnthropicKey),
     // not the gateway cfg.env — set both so the test is hermetic on CI.
-    const priorKey = process.env.ANTHROPIC_API_KEY;
-    process.env.ANTHROPIC_API_KEY = 'sk-ant-test';
-    configureGateway({
-      chat_model: 'anthropic:claude-sonnet-4-6',
-      env: { ANTHROPIC_API_KEY: 'sk-ant-test' },
-    } as never);
-    __setChatTransportForTests(async (opts: ChatOpts): Promise<ChatResult> => {
-      seen.push(opts.model ?? '<none>');
-      return {
-        text: 'stubbed answer',
-        blocks: [],
-        stopReason: 'end',
-        usage: { input_tokens: 1, output_tokens: 1, cache_read_tokens: 0, cache_creation_tokens: 0 },
-        model: opts.model ?? '',
-        providerId: 'anthropic',
-      } as ChatResult;
+    await withEnv({ ANTHROPIC_API_KEY: 'sk-ant-test' }, async () => {
+      configureGateway({
+        chat_model: 'anthropic:claude-sonnet-4-6',
+        env: { ANTHROPIC_API_KEY: 'sk-ant-test' },
+      } as never);
+      __setChatTransportForTests(async (opts: ChatOpts): Promise<ChatResult> => {
+        seen.push(opts.model ?? '<none>');
+        return {
+          text: 'stubbed answer',
+          blocks: [],
+          stopReason: 'end',
+          usage: { input_tokens: 1, output_tokens: 1, cache_read_tokens: 0, cache_creation_tokens: 0 },
+          model: opts.model ?? '',
+          providerId: 'anthropic',
+        } as ChatResult;
+      });
+
+      const client = await buildLLMClient('anthropic:claude-sonnet-4-6', false);
+      const msg = await client.create({
+        model: 'anthropic:claude-sonnet-4-6',
+        max_tokens: 32,
+        messages: [{ role: 'user', content: 'q' }],
+      });
+
+      // Pre-#2099 this path constructed `new Anthropic()` and sent the
+      // prefixed id verbatim → HTTP 404. Now the gateway serves it.
+      expect(seen).toEqual(['anthropic:claude-sonnet-4-6']);
+      const first = msg.content[0];
+      expect(first && first.type === 'text' ? first.text : '').toBe('stubbed answer');
     });
-
-    const client = await buildLLMClient('anthropic:claude-sonnet-4-6', false);
-    const msg = await client.create({
-      model: 'anthropic:claude-sonnet-4-6',
-      max_tokens: 32,
-      messages: [{ role: 'user', content: 'q' }],
-    });
-
-    // Pre-#2099 this path constructed `new Anthropic()` and sent the
-    // prefixed id verbatim → HTTP 404. Now the gateway serves it.
-    expect(seen).toEqual(['anthropic:claude-sonnet-4-6']);
-    const first = msg.content[0];
-    expect(first && first.type === 'text' ? first.text : '').toBe('stubbed answer');
-
-    if (priorKey === undefined) delete process.env.ANTHROPIC_API_KEY;
-    else process.env.ANTHROPIC_API_KEY = priorKey;
   });
 });