From 5b6f4d6bb6c7204ee02b8f4bb69a73b6019d1dbc Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 11 May 2026 14:23:32 +0100
Subject: [PATCH] test: tighten acpx memory assertions

---
 .../src/claude-agent-acp-completion.test.ts   | 22 +++++++------------
 .../src/app-server/side-question.test.ts      |  2 +-
 .../memory-core/src/memory/index.test.ts      |  8 +++----
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/extensions/acpx/src/claude-agent-acp-completion.test.ts b/extensions/acpx/src/claude-agent-acp-completion.test.ts
index 9a9fd16a1c2..a039d440ebc 100644
--- a/extensions/acpx/src/claude-agent-acp-completion.test.ts
+++ b/extensions/acpx/src/claude-agent-acp-completion.test.ts
@@ -119,13 +119,10 @@ describe("patched claude-agent-acp completion", () => {
     expect(resolved).toBe(false);
 
     query.push(makeIdleMessage());
-    await expect(promptPromise).resolves.toMatchObject({
-      stopReason: "end_turn",
-      usage: {
-        inputTokens: 1,
-        outputTokens: 1,
-      },
-    });
+    const result = await promptPromise;
+    expect(result.stopReason).toBe("end_turn");
+    expect(result.usage?.inputTokens).toBe(1);
+    expect(result.usage?.outputTokens).toBe(1);
   });
 
   it("does not resolve a prompt after a task-notification result goes idle", async () => {
@@ -182,12 +179,9 @@ describe("patched claude-agent-acp completion", () => {
     expect(resolved).toBe(false);
 
     query.push(makeIdleMessage());
-    await expect(promptPromise).resolves.toMatchObject({
-      stopReason: "end_turn",
-      usage: {
-        inputTokens: 2,
-        outputTokens: 2,
-      },
-    });
+    const result = await promptPromise;
+    expect(result.stopReason).toBe("end_turn");
+    expect(result.usage?.inputTokens).toBe(2);
+    expect(result.usage?.outputTokens).toBe(2);
   });
 });
diff --git a/extensions/codex/src/app-server/side-question.test.ts b/extensions/codex/src/app-server/side-question.test.ts
index 7ed6656f648..90f26ffdab2 100644
--- a/extensions/codex/src/app-server/side-question.test.ts
+++ b/extensions/codex/src/app-server/side-question.test.ts
@@ -255,7 +255,7 @@ describe("runCodexAppServerSideQuestion", () => {
     const forkCall = client.request.mock.calls[0];
     expect(forkCall?.[0]).toBe("thread/fork");
     const forkParams = forkCall?.[1] as Record<string, unknown> | undefined;
-    expect(Object.keys(forkParams ?? {}).sort()).toEqual([
+    expect(Object.keys(forkParams ?? {}).toSorted()).toEqual([
       "approvalPolicy",
       "approvalsReviewer",
       "config",
diff --git a/extensions/memory-core/src/memory/index.test.ts b/extensions/memory-core/src/memory/index.test.ts
index 2d66b75e869..c77d652df00 100644
--- a/extensions/memory-core/src/memory/index.test.ts
+++ b/extensions/memory-core/src/memory/index.test.ts
@@ -449,11 +449,9 @@ describe("memory index", () => {
     managersForCleanup.add(second);
 
     const cachedBeforeProbe = second.getCachedEmbeddingAvailability?.();
-    expect(cachedBeforeProbe).toMatchObject({
-      ok: true,
-      checked: true,
-      cached: true,
-    });
+    expect(cachedBeforeProbe?.ok).toBe(true);
+    expect(cachedBeforeProbe?.checked).toBe(true);
+    expect(cachedBeforeProbe?.cached).toBe(true);
     expect(cachedBeforeProbe?.checkedAtMs).toBeTypeOf("number");
     expect(cachedBeforeProbe?.cacheExpiresAtMs).toBeTypeOf("number");
     if (