From a571fcf041cc2b3930ddf48b8c2904eccfa002dc Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 8 May 2026 15:57:58 +0100
Subject: [PATCH] test: tighten auth profile assertions

---
 src/agents/auth-profiles/oauth.concurrent-agents.test.ts | 7 ++++---
 .../auth-profiles/oauth.fallback-to-main-agent.test.ts   | 7 ++++---
 ....uses-first-github-copilot-profile-env-tokens.test.ts | 9 ++++-----
 src/agents/pi-hooks/compaction-safeguard.test.ts         | 2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/agents/auth-profiles/oauth.concurrent-agents.test.ts b/src/agents/auth-profiles/oauth.concurrent-agents.test.ts
index c9e38907fb3..4460118b322 100644
--- a/src/agents/auth-profiles/oauth.concurrent-agents.test.ts
+++ b/src/agents/auth-profiles/oauth.concurrent-agents.test.ts
@@ -117,9 +117,10 @@ describe("resolveApiKeyForProfile cross-agent refresh coordination (#26322)", ()
     expect(callCount).toBe(1);
     expect(results).toHaveLength(agentCount);
     for (const result of results) {
-      expect(result).not.toBeNull();
-      expect(result?.apiKey).toBe("cross-agent-refreshed-access");
-      expect(result?.provider).toBe(provider);
+      expect(result).toMatchObject({
+        apiKey: "cross-agent-refreshed-access",
+        provider,
+      });
     }
   }, 10_000);
 });
diff --git a/src/agents/auth-profiles/oauth.fallback-to-main-agent.test.ts b/src/agents/auth-profiles/oauth.fallback-to-main-agent.test.ts
index 673f4a0cf3a..12800417176 100644
--- a/src/agents/auth-profiles/oauth.fallback-to-main-agent.test.ts
+++ b/src/agents/auth-profiles/oauth.fallback-to-main-agent.test.ts
@@ -186,9 +186,10 @@ describe("resolveApiKeyForProfile fallback to main agent", () => {
     // fresh main credentials are used read-through without copying the refresh token.
     const result = await resolveFromSecondaryAgent(profileId);
 
-    expect(result).not.toBeNull();
-    expect(result?.apiKey).toBe("fresh-access-token");
-    expect(result?.provider).toBe("anthropic");
+    expect(result).toMatchObject({
+      apiKey: "fresh-access-token",
+      provider: "anthropic",
+    });
 
     // The secondary store keeps its local credential; inherited OAuth is read-through.
     const secondaryStore = JSON.parse(
diff --git a/src/agents/models-config.uses-first-github-copilot-profile-env-tokens.test.ts b/src/agents/models-config.uses-first-github-copilot-profile-env-tokens.test.ts
index aeb53c12e70..17ce8e2063e 100644
--- a/src/agents/models-config.uses-first-github-copilot-profile-env-tokens.test.ts
+++ b/src/agents/models-config.uses-first-github-copilot-profile-env-tokens.test.ts
@@ -224,7 +224,7 @@ describe("models-config", () => {
       provider: { baseUrl: "https://api.copilot.example", models: [] },
     });
 
-    expectCopilotProviderFromPlan(plan).toEqual({
+    expect(expectCopilotProviderFromPlan(plan)).toEqual({
       baseUrl: "https://api.copilot.example",
       models: [],
     });
@@ -235,7 +235,7 @@ describe("models-config", () => {
       provider: { baseUrl: "https://api.individual.githubcopilot.com", models: [] },
     });
 
-    expectCopilotProviderFromPlan(plan)?.toEqual({
+    expect(expectCopilotProviderFromPlan(plan)).toEqual({
       baseUrl: "https://api.individual.githubcopilot.com",
       models: [],
     });
@@ -272,7 +272,6 @@ function expectCopilotProviderFromPlan(
       ? (JSON.parse(plan.contents) as { providers?: Record<string, unknown> })
       : {};
   const provider = parsed.providers?.["github-copilot"];
-  expect(typeof provider).toBe("object");
-  expect(provider).not.toBeNull();
-  return expect(provider);
+  expect(provider).toEqual(expect.any(Object));
+  return provider;
 }
diff --git a/src/agents/pi-hooks/compaction-safeguard.test.ts b/src/agents/pi-hooks/compaction-safeguard.test.ts
index d47669a02f1..0354707ec11 100644
--- a/src/agents/pi-hooks/compaction-safeguard.test.ts
+++ b/src/agents/pi-hooks/compaction-safeguard.test.ts
@@ -511,7 +511,7 @@ describe("compaction-safeguard runtime registry", () => {
   it("clears entry when value is null", () => {
     const sm = {};
     setCompactionSafeguardRuntime(sm, { maxHistoryShare: 0.7 });
-    expect(getCompactionSafeguardRuntime(sm)).not.toBeNull();
+    expect(getCompactionSafeguardRuntime(sm)).toEqual({ maxHistoryShare: 0.7 });
     setCompactionSafeguardRuntime(sm, null);
     expect(getCompactionSafeguardRuntime(sm)).toBeNull();
   });