Satisfy oxfmt and unused-binding lint on compaction rebase

Author: TheGreatAxios

src/mcp/plugin.ts

@@ -116,11 +116,7 @@ export function mcpClientTools(
                   ...(contextDir !== undefined ? { contextDir } : {}),
                 }
               : undefined;
-          const content = await truncateToolResultContent(
-            flattened,
-            undefined,
-            spill,
-          );
+          const content = await sanitizeMcpResultContent(flattened, spill);
           return { callId: call.id, content };
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);

src/plugins/tool-result-secret-scrub.test.ts

@@ -73,7 +73,9 @@ describe("toolResultSecretScrubPlugin", () => {
 
   test("scrubs grep tool results", async () => {
     const plugin = toolResultSecretScrubPlugin();
-    const handler = plugin.middleware!(
+    if (plugin.middleware === undefined)
+      throw new Error("expected middleware plugin");
+    const handler = plugin.middleware(
       next("secrets/.env:1:TOKEN=supersecretvalue"),
     );
     const result = await handler(
@@ -83,10 +85,11 @@ describe("toolResultSecretScrubPlugin", () => {
     expect(result.content).toContain(CREDENTIAL_REDACTION);
     expect(result.content).not.toContain("supersecretvalue");
   });
-
   test("scrubs error results without stringifying object content", async () => {
     const plugin = toolResultSecretScrubPlugin();
-    const handler = plugin.middleware!(
+    if (plugin.middleware === undefined)
+      throw new Error("expected middleware plugin");
+    const handler = plugin.middleware(
       next(
         {
           message: "failed with sk-abcdefghijklmnopqrstuvwxyz012345",
@@ -142,7 +145,9 @@ describe("toolResultSecretScrubPlugin", () => {
     const body =
       "Matching agent profiles:\n\n### leaky\n\nSystem prompt / body:\n" +
       "Use token sk-abcdefghijklmnopqrstuvwxyz012345 when calling the provider.";
-    const handler = plugin.middleware!(next(body));
+    if (plugin.middleware === undefined)
+      throw new Error("expected middleware plugin");
+    const handler = plugin.middleware(next(body));
     const result = await handler(
       { id: "c2", name: "search_agents", arguments: { query: "leaky" } },
       new AbortController().signal,

src/session/assemble-runtime.test.ts

@@ -152,8 +152,8 @@ function stubChatAgentWiring(
     computeAdvertised: () => [],
     activateTools: () => false,
     inactivityTimeoutMs: 1_000,
-    onTasksChange: () => {},
-    requestContinuation: () => {},
+    onTasksChange: () => undefined,
+    requestContinuation: () => undefined,
     getProvider: () => ({ providerName: "test", model: "m" }),
     getWorkdir: () => "/build-dir",
     getSessionId: () => "test-session",
@@ -169,7 +169,7 @@ function stubChatAgentWiring(
     ],
     getDefaultSource: () => "s",
     getCompactor: () => stubCompactor("build"),
-    onBuilt: () => {},
+    onBuilt: () => undefined,
     ...overrides,
   };
 }
@@ -182,7 +182,7 @@ describe("assembleChatAgent", () => {
     const fakeStorage = {
       readBlob: async () => new Uint8Array(),
     } as unknown as ContextStore;
-    const fakeAgent = { close: async () => {} } as unknown as Agent;
+    const fakeAgent = { close: async () => undefined } as unknown as Agent;
 
     await withMockedModuleDuring(
       import.meta.resolve("./optimized-context-store.js"),
@@ -256,7 +256,7 @@ describe("assembleChatAgent", () => {
     const fakeStorage = {
       readBlob: async () => new Uint8Array(),
     } as unknown as ContextStore;
-    const fakeAgent = { close: async () => {} } as unknown as Agent;
+    const fakeAgent = { close: async () => undefined } as unknown as Agent;
     const authorize = stubAuthorize();
     let capturedStorage: ContextStore | undefined;
     let capturedAuthorize: unknown;

src/session/compaction-archive.test.ts

@@ -23,6 +23,11 @@ function tempDir(): string {
   return fs.mkdtempSync(path.join(os.tmpdir(), "compaction-archive-"));
 }
 
+function required<T>(value: T | undefined, label: string): T {
+  if (value === undefined) throw new Error(`expected ${label}`);
+  return value;
+}
+
 function inbound(
   partial: Partial<InboundMessage> & { content?: string },
 ): InboundMessage {
@@ -151,8 +156,12 @@ describe("primary message admission", () => {
       inbound({ content: "also sk-abcdefghijklmnopqrstuvwxyz012345" }),
     );
     expect(delivered).toHaveLength(2);
-    expect(delivered[0]!.content).toContain(CREDENTIAL_REDACTION);
-    expect(delivered[1]!.content).toContain(CREDENTIAL_REDACTION);
+    expect(required(delivered[0], "first delivery").content).toContain(
+      CREDENTIAL_REDACTION,
+    );
+    expect(required(delivered[1], "second delivery").content).toContain(
+      CREDENTIAL_REDACTION,
+    );
   });
 
   test("history and archive share the same admitted representation", async () => {
@@ -190,16 +199,19 @@ describe("primary message admission", () => {
     );
     await archive.awaitPendingWrites();
     expect(delivered).toHaveLength(1);
-    const admitted = delivered[0]!.content!;
+    const admitted = required(
+      required(delivered[0], "first delivery").content,
+      "admitted content",
+    );
     expect(admitted).toContain(CREDENTIAL_REDACTION);
     expect(admitted).not.toContain("sk-abcdefghijklmnopqrstuvwxyz012345");
     const occurrences = await archive.listOccurrences();
     expect(occurrences).toHaveLength(1);
-    expect(occurrences[0]!.kind).toBe("user_message");
+    expect(required(occurrences[0], "occurrence").kind).toBe("user_message");
     const archived = await archive.readAuthorizedPayload(
-      occurrences[0]!.occurrenceId,
+      required(occurrences[0], "occurrence").occurrenceId,
     );
-    const history = createInboundTurn(delivered[0]!);
+    const history = createInboundTurn(required(delivered[0], "first delivery"));
     const historyText = history?.content.find((block) => block.type === "text");
     expect(historyText?.type === "text" ? historyText.text : undefined).toBe(
       archived,
@@ -244,8 +256,10 @@ describe("primary message admission", () => {
     const occurrences = await archive.listOccurrences();
     expect(occurrences).toHaveLength(1);
     expect(
-      await archive.readAuthorizedPayload(occurrences[0]!.occurrenceId),
-    ).toBe(`[From: user@local]\n\n${sent[0]!}`);
+      await archive.readAuthorizedPayload(
+        required(occurrences[0], "occurrence").occurrenceId,
+      ),
+    ).toBe(`[From: user@local]\n\n${required(sent[0], "sent")}`);
   });
 });