Clear remaining eslint errors so the new CI jobs can gate merges

Keep the two stylistic rules as warnings: ~1200 pre-existing
non-null assertions and empty functions are a backlog, not a
merge-queue blocker. The leftover unused-vars, unused-expressions,
and related errors were real and are fixed here so prettier and
eslint can report as required checks.

Amp-Thread-ID: https://ampcode.com/threads/T-01a02c68-0d8d-777b-b717-81fb9a282023
Co-authored-by: Amp <amp@ampcode.com>

Author: TheGreatAxios

.prettierignore

@@ -4,3 +4,4 @@ vendor/
 scratch/
 node_modules/
 CHANGELOG.md
+tests/fixtures/broken-toolchain/

eslint.config.js

@@ -14,6 +14,8 @@ export default tseslint.config(
       "**/scratch/**",
       "node_modules/**",
       "**/node_modules/**",
+      // Intentionally invalid source: the broken-toolchain eval fixture.
+      "tests/fixtures/broken-toolchain/**",
     ],
   },
   js.configs.recommended,
@@ -34,6 +36,9 @@ export default tseslint.config(
           caughtErrorsIgnorePattern: "^_",
         },
       ],
+      // LogTape (and a few test spies) use tagged-template logging as a
+      // statement; the expression is the side effect.
+      "@typescript-eslint/no-unused-expressions": ["error", { allowTaggedTemplates: true }],
       // Staged adoption: the codebase predates these two rules and carries
       // ~1200 pre-existing violations, almost all in tests and TUI plumbing.
       // Warning keeps them visible without making the CI gate unachievable;
@@ -42,4 +47,12 @@ export default tseslint.config(
       "@typescript-eslint/no-empty-function": "warn",
     },
   },
+  {
+    files: ["src/util/control-char-strip.ts"],
+    rules: {
+      // This module's job is matching C0/C1 bytes; the patterns are the
+      // product, not a lint accident.
+      "no-control-regex": "off",
+    },
+  },
 );

evals/capability/cases/hidden-contract-inventory/hidden/reservations.heldout.ts

@@ -1,6 +1,6 @@
 import { describe, test, expect, beforeEach, afterEach } from "bun:test";
 import { handleRequest } from "../../src/index.js";
-import { resetProducts, getProduct } from "../../src/services/products.js";
+import { resetProducts } from "../../src/services/products.js";
 import { resetReservations } from "../../src/services/reservations.js";
 import { setClock, resetClock } from "../../src/clock.js";
 

packages/first-class-providers/src/providers.ts

@@ -1,5 +1,4 @@
 import {
-  OPENCODE_GO_AUTH_HINT,
   OPENCODE_GO_BASE_URL,
   OPENCODE_GO_DEFAULT_MODEL,
   OPENCODE_GO_DISPLAY_NAME,

scripts/eval-public-swe-one.ts

@@ -16,7 +16,7 @@
  *   bun scripts/eval-public-swe-one.ts --instance … --provider <name> --model <id> --evaluate
  */
 
-import { mkdir, writeFile, readFile, mkdtemp, rm, cp } from "node:fs/promises";
+import { mkdir, writeFile, mkdtemp, rm } from "node:fs/promises";
 import { spawn } from "node:child_process";
 import { tmpdir } from "node:os";
 import { join, dirname, resolve } from "node:path";

src/agent/lazy-blob-reader.test.ts

@@ -61,10 +61,10 @@ describe("createCompositeBlobReader", () => {
   });
 
   test("falls back to the parent store for missing child keys (sub-agent re-read)", async () => {
-    let child: ReturnType<typeof readerWith> | undefined;
+    const child: { current?: ReturnType<typeof readerWith> } = {};
     const parent = readerWith({ parentSpill: "mcp-skill-body-tail" });
     const composite = createCompositeBlobReader(
-      () => child,
+      () => child.current,
       () => parent,
     );
 
@@ -73,7 +73,7 @@ describe("createCompositeBlobReader", () => {
       "mcp-skill-body-tail",
     );
 
-    child = readerWith({ ownSpill: "child-local" });
+    child.current = readerWith({ ownSpill: "child-local" });
     expect(dec.decode(await composite.read("tool-output:///parentSpill"))).toBe(
       "mcp-skill-body-tail",
     );

src/agent/posix-tool-plugins.test.ts

@@ -219,15 +219,15 @@ describe("buildCorePosixToolPlugins", () => {
       const encoder = new TextEncoder();
       // Mirrors runSubAgent wiring: child store bound after agent create, parent
       // always available so brief-handed tool-output:// URIs resolve (CL-4323).
-      let childReader: ReturnType<typeof createBlobReader> | undefined;
+      const childHolder: { current?: ReturnType<typeof createBlobReader> } = {};
       const parentReader = createBlobReader({
         async readBlob(key: string) {
           if (key === "parent-mcp-skill") return encoder.encode("parent-skill-body-tail");
           throw new Error(`Blob not found for key: ${JSON.stringify(key)}`);
         },
       });
       const blobReader = createCompositeBlobReader(
-        () => childReader,
+        () => childHolder.current,
         () => parentReader,
       );
       const gate = createPermissionGate({
@@ -258,7 +258,7 @@ describe("buildCorePosixToolPlugins", () => {
       expect(fromParent.isError).toBeFalsy();
       expect(String(fromParent.content)).toContain("parent-skill-body-tail");
 
-      childReader = createBlobReader({
+      childHolder.current = createBlobReader({
         async readBlob(key: string) {
           if (key === "child-local") return encoder.encode("child-own-spill");
           throw new Error(`Blob not found for key: ${JSON.stringify(key)}`);

src/agent/renderer.ts

@@ -14,7 +14,6 @@ const GREEN = "\x1b[32m";
 const RED = "\x1b[31m";
 const RESET = "\x1b[0m";
 
-const JOURNAL_TOOLS = new Set(["write_file", "edit_file", "run_shell", "submit_output"]);
 const SILENT_TOOLS = new Set(["read_file", "list_dir", "search_files", "grep"]);
 
 function verb(label: string): string {
@@ -27,7 +26,6 @@ function miniDiff(oldStr: string, newStr: string): string {
   const lines: string[] = [];
 
   // Simple: show removed lines then added lines with 1-line context from old
-  const context = oldLines.length > 0 ? `        ${oldLines[0]}\n` : "";
   for (const line of oldLines) {
     lines.push(`        ${RED}-${RESET} ${line}`);
   }

src/agent/tools.ts

@@ -326,21 +326,21 @@ export async function createAgentToolset(args: AgentToolsetArgs): Promise<AgentT
   // tool_search ranks over the live runner (set just below) and promotes matches
   // through a holder the runner wires up once its advertise/reload loop exists.
   const promoter: { promote: (names: string[]) => void } = { promote: () => undefined };
-  let runnerRef: DynamicToolRunner | undefined;
+  const runnerHolder: { current?: DynamicToolRunner } = {};
   const toolIndex = createToolIndex(
-    () => runnerRef?.currentDefinitions() ?? [],
+    () => runnerHolder.current?.currentDefinitions() ?? [],
     advertisedBuiltIns,
   );
   baseTools.push(
     createToolSearchTool({
       search: (query) => toolIndex.search(query),
-      lookup: (name) => runnerRef?.currentDefinitions().find((d) => d.name === name),
+      lookup: (name) => runnerHolder.current?.currentDefinitions().find((d) => d.name === name),
       promote: (names) => promoter.promote(names),
     }),
   );
 
   const dynamicRunner = createDynamicToolRunner(baseTools, toolWatchdog);
-  runnerRef = dynamicRunner;
+  runnerHolder.current = dynamicRunner;
   const connectedClients: MCPClient[] = [];
 
   const connectMCP = async (

src/auth/codex/session.ts

@@ -23,7 +23,10 @@ export class CodexAuthError extends Error {
 // chatgpt-account-id header. Returned together so callers need a single load,
 // not a token fetch followed by a separate profile read (which could observe a
 // token and account id from two different points in a concurrent refresh).
-export interface CodexAccess { access: string; accountId?: string | undefined }
+export interface CodexAccess {
+  access: string;
+  accountId?: string | undefined;
+}
 
 const session = createTokenSession<CodexTokens, CodexAccess>({
   skewMs: CODEX_REFRESH_SKEW_MS,