c64bridge 0.8.1 → 0.9.1

package/mcp.json

@@ -1,6 +1,6 @@
 {
   "name": "c64bridge",
-  "version": "0.8.1",
+  "version": "0.9.1",
   "description": "Stdio-based Model Context Protocol (MCP) server that bridges Commodore 64 Ultimate hardware with AI agents.",
   "entry": "dist/index.js",
   "type": "stdio",
@@ -113,11 +113,11 @@
       "default": "120000000"
     },
     "VICE_BINARY": {
-      "description": "VICE binary to launch for managed emulator sessions and audio capture",
+      "description": "VICE binary to launch for managed emulator sessions and audio capture; automatic search is used only when this override is missing or invalid",
       "default": "x64sc"
     },
     "VICE_DIRECTORY": {
-      "description": "Override the VICE resource directory used for ROM and UI asset discovery",
+      "description": "Override the VICE resource directory used for ROM and UI asset discovery; automatic search is used only when this override is missing or invalid",
       "default": "auto-detect"
     },
     "VICE_HOST": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c64bridge",
-  "version": "0.8.1",
+  "version": "0.9.1",
   "mcpName": "io.github.chrisgleissner/c64bridge",
   "description": "C64 Bridge MCP server for Commodore 64 Ultimate hardware and VICE emulator control",
   "type": "module",
@@ -22,9 +22,11 @@
     "lint": "npm run check",
     "test": "node scripts/invoke-bun.mjs scripts/run-tests.ts",
     "test:node": "node scripts/run-tests.mjs",
+    "test:vice:mock": "npm run test -- --platform=vice --target=mock",
+    "test:vice:device": "FORCE_XVFB=1 VICE_VISIBLE=false VICE_WARP=true npm run test -- --platform=vice --target=device",
     "coverage": "node scripts/run-coverage.mjs",
     "coverage:single": "node scripts/invoke-bun.mjs scripts/run-tests.ts --coverage",
-    "test:matrix": "npm run test -- --platform=c64u --target=mock && npm run test -- --platform=vice --target=mock && npm run test -- --platform=vice --target=device",
+    "test:matrix": "npm run test -- --platform=c64u --target=mock && npm run test:vice:mock && npm run test:vice:device",
     "mcp:generate": "node scripts/invoke-bun.mjs scripts/generate-mcp-interface.ts",
     "check:package": "node scripts/check-package.mjs",
     "check:run-local": "bash scripts/run-mcp-check.sh local 5",
@@ -40,7 +42,8 @@
     "changelog:generate": "node scripts/generate-changelog.mjs",
     "release:prepare": "node scripts/prepare-release.mjs",
     "compare:rest": "node scripts/compare-rest-apis.mjs",
-    "vice:smoke": "node scripts/invoke-bun.mjs test/vice/viceSmokeTest.ts"
+    "vice:smoke": "node scripts/invoke-bun.mjs test/vice/viceSmokeTest.ts",
+    "vice:smoke:visible": "node scripts/invoke-bun.mjs test/vice/viceSmokeTest.ts --visible-demo"
   },
   "keywords": [
     "mcp",
@@ -59,24 +62,24 @@
     "node": ">=24"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.20.2",
-    "axios": "^1.7.7",
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "axios": "^1.16.0",
     "date-fns": "^4.1.0",
-    "fastify": "^5.6.1",
-    "jimp": "^1.6.0",
-    "meyda": "^5.6.2",
-    "octokit": "^5.0.4",
-    "pitchfinder": "^2.2.0",
+    "fastify": "^5.8.5",
+    "jimp": "^1.6.1",
+    "meyda": "^5.6.3",
+    "octokit": "^5.0.5",
+    "pitchfinder": "^2.3.4",
     "reflect-metadata": "^0.2.2",
-    "yaml": "^2.6.0"
+    "yaml": "^2.8.4"
   },
   "optionalDependencies": {
     "naudiodon": "^2.3.6"
   },
   "devDependencies": {
-    "@types/node": "^24.12.0",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.9.3"
+    "@types/node": "^25.6.0",
+    "tsx": "^4.21.0",
+    "typescript": "^6.0.3"
   },
   "files": [
     "mcp.json",

package/scripts/fetch-external-sources.mjs

@@ -7,8 +7,7 @@ import { register } from 'node:module';
 async function main() {
   const __dirname = path.dirname(fileURLToPath(import.meta.url));
   const projectRoot = path.resolve(__dirname, '..');
-  const tsNodeLoader = pathToFileURL(path.join(projectRoot, 'node_modules', 'ts-node', 'esm.mjs')).href;
-  register(tsNodeLoader, pathToFileURL(projectRoot));
+  register("tsx/esm", pathToFileURL(projectRoot));
   const { fetchFromCsv } = await import('../src/rag/externalFetcher.ts');
   // Resolve sources.csv from env, dist/rag, or src/rag (in that order)
   let csvPath = process.env.RAG_SOURCES_CSV;

package/scripts/run-coverage.mjs

@@ -13,6 +13,24 @@ const runner = path.join(repoRoot, "scripts", "invoke-bun.mjs");
 const configPath = path.join(repoRoot, ".c8rc.json");
 const testRoot = path.join(repoRoot, "test");
 const DEFAULT_COVERAGE_SHARD_SIZE = 12;
+const DEFAULT_VICE_MOCK_TEST_FILES = [
+  "test/device.test.mjs",
+  "test/viceIntegration.test.mjs",
+  "test/viceModule.test.mjs",
+  "test/groupedToolsShims.test.mjs",
+  "test/inputModule.test.mjs",
+  "test/batchAndDisplayState.test.mjs",
+  "test/toolsTypes.test.mjs",
+  "test/platformRegistry.test.mjs",
+  "test/meta/program.test.mjs",
+  "test/mcpServerIntegration.test.mjs",
+  "test/c64Client.test.mjs",
+  "test/vice/viceSmokeTest.ts",
+];
+const DEFAULT_VICE_DEVICE_TEST_FILES = [
+  "test/device.test.mjs",
+  "test/vice/viceSmokeTest.ts",
+];
 
 const legs = [
   { name: "c64u-mock", args: ["--platform=c64u", "--target=mock"] },
@@ -24,6 +42,11 @@ const supplementalTests = [
   "test/toolsCoverage.test.mjs",
   "test/audioModule.test.mjs",
   "test/updateReadme.test.mjs",
+  "test/toolsSchema.test.mjs",
+  "test/symbolRegistry.test.mjs",
+  "test/programRunnersModule.test.mjs",
+  "test/batchAndDisplayState.test.mjs",
+  "test/inputModule.test.mjs",
   "test/viceIntegration.test.mjs",
 ];
 
@@ -50,11 +73,20 @@ export async function main() {
   const allTestFiles = await listRepoTestFiles(testRoot);
   const isolatedTestSet = new Set(isolatedTests);
   const defaultTestFiles = allTestFiles.filter((f) => !isolatedTestSet.has(f));
-  const coverageBatches = buildCoverageBatches(defaultTestFiles, [...supplementalTests, ...isolatedTests], process.env);
   for (const leg of legs) {
     const legDir = path.join(coverageDir, "matrix", leg.name);
     await fs.mkdir(legDir, { recursive: true });
 
+    const legDefaultFiles = leg.name === "vice-mock"
+      ? DEFAULT_VICE_MOCK_TEST_FILES
+      : leg.name === "vice-device"
+        ? DEFAULT_VICE_DEVICE_TEST_FILES
+        : defaultTestFiles;
+    const legSupplementalTests = leg.name.startsWith("vice")
+      ? []
+      : [...supplementalTests, ...isolatedTests];
+    const coverageBatches = buildCoverageBatches(legDefaultFiles, legSupplementalTests, process.env);
+
     const reports = [];
     for (const batch of coverageBatches) {
       reports.push(await runCoverageLeg(leg, legDir, batch.label, batch.files));

package/scripts/run-tests.mjs

@@ -8,7 +8,7 @@ import { fileURLToPath } from "node:url";
 export const DEFAULT_TARGET = "mock";
 
 const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
-const registerDataUri = "data:text/javascript,import { register } from \"node:module\"; import { pathToFileURL } from \"node:url\"; register(\"ts-node/esm\", pathToFileURL(\"./\"));";
+const tsLoader = "tsx/esm";
 const { nodeArgs, target, explicitBaseUrl } = buildNodeTestArgs(process.argv.slice(2));
 const defaultEmbeddingsDir = path.join(repoRoot, "artifacts", "test-embeddings");
 if (!fs.existsSync(defaultEmbeddingsDir)) {
@@ -180,7 +180,7 @@ function isMainModule(moduleUrl) {
 
 export function buildNodeTestArgs(args, root = repoRoot) {
   const defaultTestFiles = listRepoTestFiles(path.join(root, "test"), root);
-  const nodeArgs = ["--import", registerDataUri, "--test"];
+  const nodeArgs = ["--import", tsLoader, "--test"];
   let target = DEFAULT_TARGET;
   let explicitBaseUrl = null;
   let hasExplicitTestFiles = false;

package/scripts/run-tests.ts

@@ -9,14 +9,79 @@ import { fileURLToPath } from "node:url";
 const DEFAULT_TARGET = "mock";
 const DEFAULT_PLATFORM = "c64u";
 const DEFAULT_BUN_FILE_LIMIT = 4;
-const DEFAULT_BUN_BATCH_SIZE = 12;
+// Keep default Bun shards small enough to avoid descriptor exhaustion on broad suites.
+const DEFAULT_BUN_BATCH_SIZE = DEFAULT_BUN_FILE_LIMIT;
+const DEFAULT_VICE_MOCK_TEST_FILES = [
+  "test/device.test.mjs",
+  "test/viceIntegration.test.mjs",
+  "test/viceModule.test.mjs",
+  "test/groupedToolsShims.test.mjs",
+  "test/inputModule.test.mjs",
+  "test/batchAndDisplayState.test.mjs",
+  "test/toolsTypes.test.mjs",
+  "test/platformRegistry.test.mjs",
+  "test/meta/program.test.mjs",
+  "test/mcpServerIntegration.test.mjs",
+  "test/c64Client.test.mjs",
+  "test/vice/viceSmokeTest.ts",
+];
+const DEFAULT_VICE_DEVICE_TEST_FILES = [
+  "test/device.test.mjs",
+  "test/vice/viceSmokeTest.ts",
+];
+const BUN_ONLY_TEST_IMPORT_RE = /from\s+["']bun:test["']/;
+const BUN_RUNTIME_REQUIRED_TEST_FILES = new Set([
+  "test/generateMcpInterface.test.mjs",
+  "test/scripts/start.test.mjs",
+]);
+const ISOLATED_NODE_TEST_FILES = new Set([
+  "test/mcpServerIntegration.test.mjs",
+  "test/mcpServerPlatformInit.test.mjs",
+  "test/meta/background.test.mjs",
+  "test/pollIntegration.test.mjs",
+  "test/pollValidator.test.mjs",
+  "test/programRunnersModule.test.mjs",
+  "test/toolsCoverage.test.mjs",
+]);
 const ISOLATED_BUN_TEST_FILES = new Set([
   "test/audioRuntime.test.mjs",
+  "test/mcpServerIntegration.test.mjs",
+  "test/mcpServerPlatformInit.test.mjs",
 ]);
 const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const defaultEmbeddingsDir = path.join(repoRoot, "artifacts", "test-embeddings");
 const defaultTestFiles = listRepoTestFiles(path.join(repoRoot, "test"));
 
+function findExecutableOnPath(binary: string, envPath: string | undefined = process.env.PATH): string | null {
+  const normalized = binary.trim();
+  if (!normalized) {
+    return null;
+  }
+  if (path.isAbsolute(normalized) || normalized.includes(path.sep)) {
+    try {
+      fs.accessSync(normalized, fs.constants.X_OK);
+      return normalized;
+    } catch {
+      return null;
+    }
+  }
+
+  for (const entry of (envPath ?? "").split(path.delimiter)) {
+    if (!entry) {
+      continue;
+    }
+    const candidate = path.join(entry, normalized);
+    try {
+      fs.accessSync(candidate, fs.constants.X_OK);
+      return candidate;
+    } catch {
+      // Continue searching PATH.
+    }
+  }
+
+  return null;
+}
+
 function resolveNodeExecutable(): string {
   const candidates = [
     process.env.C64BRIDGE_TEST_NODE_BIN,
@@ -35,6 +100,31 @@ function resolveNodeExecutable(): string {
   return "node";
 }
 
+function resolveBunExecutable(env: NodeJS.ProcessEnv = process.env): string | null {
+  if (typeof (globalThis as { Bun?: unknown }).Bun !== "undefined") {
+    return process.execPath;
+  }
+
+  const candidates = [
+    env.C64BRIDGE_TEST_BUN_BIN,
+    env.C64BRIDGE_BUN_BIN,
+    process.env.C64BRIDGE_TEST_BUN_BIN,
+    process.env.C64BRIDGE_BUN_BIN,
+    "bun",
+  ];
+
+  for (const candidate of candidates) {
+    if (candidate && typeof candidate === "string" && candidate.trim()) {
+      const resolved = findExecutableOnPath(candidate.trim(), env.PATH ?? process.env.PATH);
+      if (resolved) {
+        return resolved;
+      }
+    }
+  }
+
+  return null;
+}
+
 export type RunTestsArgs = {
   target: string;
   platform: "c64u" | "vice";
@@ -43,6 +133,53 @@ export type RunTestsArgs = {
   passthrough: string[];
 };
 
+export function buildMatrixEnv(
+  platform: "c64u" | "vice",
+  target: "mock" | "device",
+  explicitBaseUrl: string | null,
+  envSource: NodeJS.ProcessEnv = process.env,
+): Record<string, string> {
+  const env: Record<string, string> = { ...envSource } as Record<string, string>;
+  env.C64_MODE = platform;
+  env.C64_TEST_TARGET = target === "device" ? "real" : "mock";
+
+  if (platform === "vice") {
+    const useViceMock = target !== "device";
+    env.VICE_TEST_TARGET = useViceMock ? "mock" : "vice";
+    env.C64_TEST_ENABLE_VICE_MOCK = useViceMock ? "1" : "0";
+    if (!useViceMock) {
+      env.VICE_AVAILABLE = "1";
+    }
+  } else {
+    delete env.VICE_TEST_TARGET;
+    delete env.C64_TEST_ENABLE_VICE_MOCK;
+  }
+
+  if (!env.RAG_EMBEDDINGS_DIR) {
+    env.RAG_EMBEDDINGS_DIR = defaultEmbeddingsDir;
+  }
+  if (explicitBaseUrl) {
+    env.C64_TEST_BASE_URL = explicitBaseUrl;
+  }
+  if (platform === "c64u" && target === "device" && !env.C64_TEST_BASE_URL) {
+    env.C64_TEST_BASE_URL = resolveBaseUrlFromConfig(env) ?? "http://c64u";
+  }
+
+  return env;
+}
+
+export function resolveDefaultMatrixTestFiles(
+  platform: "c64u" | "vice",
+  target: "mock" | "device",
+): string[] {
+  if (platform !== "vice") {
+    return [...defaultTestFiles];
+  }
+  return target === "device"
+    ? [...DEFAULT_VICE_DEVICE_TEST_FILES]
+    : [...DEFAULT_VICE_MOCK_TEST_FILES];
+}
+
 export function parseRunTestsArgs(args: string[]): RunTestsArgs {
   let target = DEFAULT_TARGET;
   let platform: "c64u" | "vice" = DEFAULT_PLATFORM;
@@ -106,6 +243,10 @@ export function shouldUseNodeFallback(runCoverage: boolean, passthrough: string[
   if (runCoverage) {
     return false;
   }
+  if (String(env.C64_MODE ?? "").trim().toLowerCase() === "vice"
+    && String(env.VICE_TEST_TARGET ?? "").trim().toLowerCase() === "vice") {
+    return true;
+  }
 
   const explicitFiles = passthrough.filter(looksLikeTestFileArg);
   if (passthrough.length === 0) {
@@ -139,11 +280,72 @@ export function buildBunTestBatches(passthrough: string[], env: NodeJS.ProcessEn
   ];
 }
 
+export function splitPassthroughByRuntime(
+  passthrough: string[],
+  root: string = repoRoot,
+): { nodePassthrough: string[]; bunPassthrough: string[] } {
+  const explicitFiles = passthrough.filter(looksLikeTestFileArg);
+  if (explicitFiles.length === 0) {
+    return { nodePassthrough: [...passthrough], bunPassthrough: [] };
+  }
+
+  const sharedArgs = passthrough.filter((arg) => !looksLikeTestFileArg(arg));
+  const bunFiles = explicitFiles.filter((file) => isBunOnlyTestFile(path.join(root, file)));
+  const nodeFiles = explicitFiles.filter((file) => !bunFiles.includes(file));
+
+  return {
+    nodePassthrough: nodeFiles.length > 0 ? [...nodeFiles, ...sharedArgs] : [],
+    bunPassthrough: bunFiles.length > 0 ? [...bunFiles, ...sharedArgs] : [],
+  };
+}
+
+export function buildNodeFallbackBatches(
+  passthrough: string[],
+  root: string = repoRoot,
+): string[][] {
+  const explicitFiles = passthrough.filter(looksLikeTestFileArg);
+  if (explicitFiles.length === 0) {
+    return [passthrough];
+  }
+
+  const sharedArgs = passthrough.filter((arg) => !looksLikeTestFileArg(arg));
+  const isolatedFiles = explicitFiles.filter((file) => isNodeIsolatedTestFile(path.join(root, file)));
+  const sharedFiles = explicitFiles.filter((file) => !isolatedFiles.includes(file));
+  const batches: string[][] = [];
+
+  if (sharedFiles.length > 0) {
+    batches.push([...sharedFiles, ...sharedArgs]);
+  }
+  for (const file of isolatedFiles) {
+    batches.push([file, ...sharedArgs]);
+  }
+
+  return batches.length > 0 ? batches : [passthrough];
+}
+
+function isBunOnlyTestFile(filePath: string): boolean {
+  const relativePath = path.relative(repoRoot, filePath).split(path.sep).join("/");
+  if (BUN_RUNTIME_REQUIRED_TEST_FILES.has(relativePath)) {
+    return true;
+  }
+  try {
+    return BUN_ONLY_TEST_IMPORT_RE.test(fs.readFileSync(filePath, "utf8"));
+  } catch {
+    return false;
+  }
+}
+
+function isNodeIsolatedTestFile(filePath: string): boolean {
+  const relativePath = path.relative(repoRoot, filePath).split(path.sep).join("/");
+  return ISOLATED_NODE_TEST_FILES.has(relativePath);
+}
+
 async function runNodeFallback(target: string, explicitBaseUrl: string | null, passthrough: string[], env: Record<string, string>, runCoverage: boolean): Promise<number> {
   console.warn("[run-tests] Using Node runner for this test set to avoid Bun memory growth on broad suites");
   if (runCoverage) {
     console.warn("[run-tests] Coverage reporting is unavailable in Node fallback mode");
   }
+  const { nodePassthrough, bunPassthrough } = splitPassthroughByRuntime(passthrough);
   const nodeExecutable = resolveNodeExecutable();
   const nodeScript = path.join(repoRoot, "scripts", "run-tests.mjs");
   const fallbackArgs = [] as string[];
@@ -153,23 +355,53 @@ async function runNodeFallback(target: string, explicitBaseUrl: string | null, p
   if (explicitBaseUrl) {
     fallbackArgs.push(`--base-url=${explicitBaseUrl}`);
   }
-  fallbackArgs.push(...passthrough);
-  return await new Promise<number>((resolve) => {
-    const childProcess = spawn(nodeExecutable, [nodeScript, ...fallbackArgs], {
-      cwd: repoRoot,
-      env,
-      stdio: "inherit",
-    }) as unknown as {
-      on(event: "error", listener: (error: Error) => void): void;
-      on(event: "exit", listener: (code: number | null) => void): void;
-    };
-    childProcess.on("error", (error) => {
-      console.error("[run-tests] Failed to launch Node fallback:", error);
-      resolve(1);
-    });
-    childProcess.on("exit", (code) => {
-      resolve(typeof code === "number" ? code : 1);
-    });
+  if (nodePassthrough.length > 0 || bunPassthrough.length === 0) {
+    const nodeBatches = buildNodeFallbackBatches(nodePassthrough);
+    for (let index = 0; index < nodeBatches.length; index += 1) {
+      const batch = nodeBatches[index] ?? [];
+      if (nodeBatches.length > 1) {
+        console.warn(`[run-tests] Node fallback batch ${index + 1}/${nodeBatches.length} (${batch.filter(looksLikeTestFileArg).length} files)`);
+      }
+      const nodeExitCode = await new Promise<number>((resolve) => {
+        const childProcess = spawn(nodeExecutable, [nodeScript, ...fallbackArgs, ...batch], {
+          cwd: repoRoot,
+          env,
+          stdio: "inherit",
+        }) as unknown as {
+          on(event: "error", listener: (error: Error) => void): void;
+          on(event: "exit", listener: (code: number | null) => void): void;
+        };
+        childProcess.on("error", (error) => {
+          console.error("[run-tests] Failed to launch Node fallback:", error);
+          resolve(1);
+        });
+        childProcess.on("exit", (code) => {
+          resolve(typeof code === "number" ? code : 1);
+        });
+      });
+
+      if (nodeExitCode !== 0) {
+        return nodeExitCode;
+      }
+    }
+  }
+
+  if (bunPassthrough.length === 0) {
+    return 0;
+  }
+
+  const bunExecutable = resolveBunExecutable(env);
+  if (!bunExecutable) {
+    console.error("[run-tests] Bun-only tests were selected but no Bun executable is available");
+    return 1;
+  }
+
+  console.warn("[run-tests] Running Bun-only tests under Bun to preserve runtime coverage");
+  const bunBatches = buildBunTestBatches(bunPassthrough, env);
+  return await runBunBatches(env, bunBatches, {
+    coverage: false,
+    bunExecutable,
+    labelPrefix: "bun-only-suite",
   });
 }
 
@@ -200,24 +432,11 @@ async function main(): Promise<number> {
     fs.mkdirSync(defaultEmbeddingsDir, { recursive: true });
   }
 
-  const env: Record<string, string> = { ...process.env } as Record<string, string>;
   const normalizedTarget = normalizeTarget(target);
-  env.C64_MODE = platform;
-  env.C64_TEST_TARGET = normalizedTarget === "device" ? "real" : "mock";
-  if (platform === "vice") {
-    env.VICE_TEST_TARGET = normalizedTarget === "device" ? "vice" : "mock";
-  } else {
-    delete env.VICE_TEST_TARGET;
-  }
-  if (!env.RAG_EMBEDDINGS_DIR) {
-    env.RAG_EMBEDDINGS_DIR = defaultEmbeddingsDir;
-  }
-  if (explicitBaseUrl) {
-    env.C64_TEST_BASE_URL = explicitBaseUrl;
-  }
-  if (platform === "c64u" && normalizedTarget === "device" && !env.C64_TEST_BASE_URL) {
-    env.C64_TEST_BASE_URL = resolveBaseUrlFromConfig(env) ?? "http://c64u";
-  }
+  const env = buildMatrixEnv(platform, normalizedTarget, explicitBaseUrl);
+  const effectivePassthrough = passthrough.length > 0
+    ? passthrough
+    : resolveDefaultMatrixTestFiles(platform, normalizedTarget);
 
   printMatrixHeading({
     platform,
@@ -230,24 +449,20 @@ async function main(): Promise<number> {
   const bunRuntime = (globalThis as { Bun?: unknown }).Bun;
   if (!bunRuntime) {
     console.warn("[run-tests] Bun runtime not detected; falling back to Node runner");
-    return await runNodeFallback(target, explicitBaseUrl, passthrough, env, runCoverage);
+    return await runNodeFallback(target, explicitBaseUrl, effectivePassthrough, env, runCoverage);
   }
 
-  if (!runCoverage && passthrough.length === 0) {
-    return await runBunBatches(env, buildBunTestBatches([], env), {
-      coverage: false,
-      labelPrefix: "default-suite",
-    });
+  if (shouldUseNodeFallback(runCoverage, effectivePassthrough, env)) {
+    return await runNodeFallback(target, explicitBaseUrl, effectivePassthrough, env, runCoverage);
   }
 
-  if (shouldUseNodeFallback(runCoverage, passthrough, env)) {
-    if (!runCoverage) {
-      return await runBunBatches(env, buildBunTestBatches(passthrough, env), {
-        coverage: false,
-        labelPrefix: "sharded-suite",
-      });
-    }
-    return await runNodeFallback(target, explicitBaseUrl, passthrough, env, runCoverage);
+  if (!runCoverage) {
+    const batches = buildBunTestBatches(effectivePassthrough, env);
+    return await runBunBatches(env, batches, {
+      bunExecutable: process.execPath,
+      coverage: false,
+      labelPrefix: passthrough.length === 0 ? "default-suite" : "sharded-suite",
+    });
   }
 
   const bunArgs = [
@@ -259,7 +474,7 @@ async function main(): Promise<number> {
           "--coverage-reporter=text",
         ]
       : []),
-    ...(passthrough.length > 0 ? passthrough : defaultTestFiles),
+    ...effectivePassthrough.map((arg) => normalizeBunBatchArg(arg)),
   ];
   return await runExternalCommand(process.execPath, bunArgs, env);
 }
@@ -345,7 +560,7 @@ function chunkFiles(files: string[], chunkSize: number): string[][] {
 async function runBunBatches(
   env: Record<string, string>,
   batches: string[][],
-  options: { coverage: boolean; labelPrefix: string },
+  options: { coverage: boolean; labelPrefix: string; bunExecutable: string },
 ): Promise<number> {
   const coverageArgs = options.coverage
     ? ["--coverage", "--coverage-reporter=lcov", "--coverage-reporter=text"]
@@ -354,7 +569,8 @@ async function runBunBatches(
   for (let index = 0; index < batches.length; index += 1) {
     const batch = batches[index] ?? [];
     console.log(`[run-tests] ${options.labelPrefix} batch ${index + 1}/${batches.length} (${batch.length} entries)`);
-    const exitCode = await runExternalCommand(process.execPath, ["test", ...coverageArgs, ...batch], env);
+    const bunArgs = batch.map((arg) => normalizeBunBatchArg(arg));
+    const exitCode = await runExternalCommand(options.bunExecutable, ["test", ...coverageArgs, ...bunArgs], env);
     if (exitCode !== 0) {
       return exitCode;
     }
@@ -363,6 +579,13 @@ async function runBunBatches(
   return 0;
 }
 
+export function normalizeBunBatchArg(arg: string): string {
+  if (looksLikeTestFileArg(arg) && !arg.startsWith("./") && !arg.startsWith("../") && !path.isAbsolute(arg)) {
+    return `./${arg}`;
+  }
+  return arg;
+}
+
 function listRepoTestFiles(testRoot: string): string[] {
   const files: string[] = [];