Merge pull request #578 from corbitsdev/cl-5759-test-files-are-outside-the-typecheck-scope-so-deleted-fields

Bring test files and fixtures into typecheck scope

Author: TheGreatAxios

evals/capability/lib.test.ts

@@ -667,8 +667,8 @@ describe("resolveRequestedProviderModel", () => {
     expect(requested).toEqual({ provider: raw.provider, model: raw.model });
 
     const fallback = detectProviderFallback({
-      requestedProvider: requested.provider,
-      requestedModel: requested.model,
+      ...(requested.provider !== undefined ? { requestedProvider: requested.provider } : {}),
+      ...(requested.model !== undefined ? { requestedModel: requested.model } : {}),
       resolvedProvider: cell!.provider,
       resolvedModel: cell!.model,
     });
@@ -695,7 +695,7 @@ describe("resolveRequestedProviderModel", () => {
       {},
       { provider: "(default)", model: "(default)" },
     );
-    expect(requested).toEqual({ provider: undefined, model: undefined });
+    expect(requested).toEqual({});
   });
 });
 

evals/capability/lib.ts

@@ -477,9 +477,11 @@ export function resolveRequestedProviderModel(
 ): { provider?: string; model?: string } {
   const requested = (v?: string): string | undefined =>
     v === undefined || v === "(default)" ? undefined : v;
+  const provider = variant.provider ?? requested(labels.provider);
+  const model = variant.model ?? requested(labels.model);
   return {
-    provider: variant.provider ?? requested(labels.provider),
-    model: variant.model ?? requested(labels.model),
+    ...(provider !== undefined ? { provider } : {}),
+    ...(model !== undefined ? { model } : {}),
   };
 }
 

scripts/eval-capability.test.ts

@@ -5,8 +5,8 @@ import { join } from "node:path";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 
-import { initEvalGitRepo, mapPool, parseArgs, buildEvalDiagnostics } from "./eval-capability.ts";
-import type { Config } from "../src/config/index.ts";
+import { initEvalGitRepo, mapPool, parseArgs, buildEvalDiagnostics } from "./eval-capability.js";
+import type { Config } from "../src/config/index.js";
 
 const execFileAsync = promisify(execFile);
 

scripts/eval-capability.ts

@@ -257,13 +257,20 @@ export function parseArgs(argv: readonly string[]): CliOptions {
   return opts;
 }
 
+// exactOptionalPropertyTypes forbids passing an explicit `undefined` for an
+// optional field, so build the fallback object with the key present only
+// when the CLI option was actually given.
+function providerModelFallback(opts: CliOptions): { provider?: string; model?: string } {
+  return {
+    ...(opts.provider !== undefined ? { provider: opts.provider } : {}),
+    ...(opts.model !== undefined ? { model: opts.model } : {}),
+  };
+}
+
 function requireExplicitModelPair(opts: CliOptions): void {
   const matrix = opts.matrix?.trim();
   if (matrix !== undefined && matrix.length > 0) {
-    parseMatrix(matrix, {
-      provider: opts.provider,
-      model: opts.model,
-    });
+    parseMatrix(matrix, providerModelFallback(opts));
     return;
   }
   if (!opts.provider && !opts.model) {
@@ -705,8 +712,8 @@ async function runCase(
     const resolvedProvider = execResult.provider ?? config.providerName ?? labels.provider;
     const resolvedModel = execResult.model ?? config.model ?? labels.model;
     providerFallback = detectProviderFallback({
-      requestedProvider: requested.provider,
-      requestedModel: requested.model,
+      ...(requested.provider !== undefined ? { requestedProvider: requested.provider } : {}),
+      ...(requested.model !== undefined ? { requestedModel: requested.model } : {}),
       resolvedProvider,
       resolvedModel,
     });
@@ -852,10 +859,7 @@ async function main(): Promise<number> {
   }
   const all = await loadEvalCases(CASES_ROOT);
   const selected = filterCases(all, opts.caseSelector);
-  const variants = parseMatrix(opts.matrix, {
-    provider: opts.provider,
-    model: opts.model,
-  });
+  const variants = parseMatrix(opts.matrix, providerModelFallback(opts));
   const plan = expandMatrix(selected, variants);
 
   console.log(

scripts/eval-public-swe-one.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
-import { parseArgs } from "./eval-public-swe-one.ts";
+import { parseArgs } from "./eval-public-swe-one.js";
 
 describe("parseArgs", () => {
   test("--help does not require provider or model", () => {

src/cost/pricing-fetcher.ts

@@ -27,7 +27,9 @@ export interface PricingCache {
 export interface PricingFetcherOptions {
   cachePath?: string;
   endpoint?: string;
-  fetchImpl?: typeof fetch;
+  // The plain call signature, not `typeof fetch` — `typeof fetch` also carries
+  // static members (e.g. `preconnect`) that a test double has no reason to implement.
+  fetchImpl?: (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
   fetchTimeoutMs?: number;
   now?: () => number;
   refreshIntervalMs?: number;

tests/fixtures/plugins/implement-feature/src/index.ts

@@ -1,6 +1,6 @@
 import { implementFeature } from "./workflows/implement-feature.js";
-import type { CommandPlugin } from "../../../src/tui/commands/registry.js";
-import type { WorkflowPlugin } from "../../../src/workflows/definition.js";
+import type { CommandPlugin } from "../../../../../src/tui/commands/registry.js";
+import type { WorkflowPlugin } from "../../../../../src/workflows/definition.js";
 
 export const workflowPlugin: WorkflowPlugin = {
   workflows: [implementFeature],

tests/fixtures/plugins/implement-feature/src/workflows/implement-feature.ts

@@ -1,4 +1,4 @@
-import type { Workflow } from "../../../../src/workflows/definition.js";
+import type { Workflow } from "../../../../../../src/workflows/definition.js";
 
 export const implementFeature: Workflow = {
   name: "implement-feature",

tests/integration/vendored-carry.test.ts

@@ -75,7 +75,12 @@ describe("integration — vendored feature carry", () => {
 
       const requests = session.harness.scenario.matchedRequests();
       expect(requests.length).toBeGreaterThan(0);
-      const bodies = await Promise.all(requests.map((r) => r.clone().text()));
+      // HarnessRequest resolves to a body-less fallback shape under this project's
+      // DOM-less lib config, even though it carries a real body at runtime; cast
+      // through the Fetch Request shape to read it.
+      const bodies = await Promise.all(
+        requests.map((r) => (r.clone() as unknown as Request).text()),
+      );
       expect(bodies.some((b) => b.includes(TRANSFORM_MARKER))).toBe(true);
     } finally {
       await closeIntegrationSession(session);
@@ -148,7 +153,12 @@ describe("integration — vendored feature carry", () => {
 
       const requests = harness.scenario.matchedRequests();
       expect(requests.length).toBeGreaterThan(0);
-      const bodies = await Promise.all(requests.map((r) => r.clone().text()));
+      // HarnessRequest resolves to a body-less fallback shape under this project's
+      // DOM-less lib config, even though it carries a real body at runtime; cast
+      // through the Fetch Request shape to read it.
+      const bodies = await Promise.all(
+        requests.map((r) => (r.clone() as unknown as Request).text()),
+      );
       expect(bodies.some((b) => b.includes(NUDGE_MARKER))).toBe(true);
 
       // Prompt-only: the nudge must not be persisted.

tests/unit/codex-session.test.ts

@@ -52,7 +52,7 @@ describe("getValidCodexToken", () => {
     await withHome(async (home) => {
       globalThis.fetch = (() => {
         throw new Error("should not be called");
-      }) as typeof fetch;
+      }) as unknown as typeof fetch;
       await saveCodexProfile(
         {
           name: "p",
@@ -69,7 +69,7 @@ describe("getValidCodexToken", () => {
     await withHome(async (home) => {
       globalThis.fetch = (() => {
         throw new Error("should not be called");
-      }) as typeof fetch;
+      }) as unknown as typeof fetch;
       await saveCodexProfile(
         {
           name: "p",
@@ -97,7 +97,7 @@ describe("getValidCodexToken", () => {
             status: 200,
             headers: { "content-type": "application/json" },
           },
-        )) as typeof fetch;
+        )) as unknown as typeof fetch;
       const token = await getValidCodexToken("p", 5_000, home);
       expect(token.access).toBe("fresh");
       const stored = await loadCodexProfile("p", home);
@@ -122,7 +122,8 @@ describe("getValidCodexToken", () => {
         { name: "p", createdAt: 0, tokens: { access: "old", refresh: "bad", expiresAt: 1_000 } },
         home,
       );
-      globalThis.fetch = (async () => new Response("revoked", { status: 400 })) as typeof fetch;
+      globalThis.fetch = (async () =>
+        new Response("revoked", { status: 400 })) as unknown as typeof fetch;
       const err = await getValidCodexToken("p", 5_000, home).catch((e: unknown) => e);
       expect(err).toBeInstanceOf(CodexAuthError);
       expect((err as CodexAuthError).reason).toBe("refresh-failed");