forgeos 0.1.0-alpha.2 → 0.1.0-alpha.21

package/src/forge/cli/verify.ts

@@ -1,21 +1,38 @@
+import { mkdtempSync, rmSync } from "node:fs";
 import { nodeFileSystem } from "../compiler/fs/index.ts";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { spawn } from "node:child_process";
+import { availableParallelism, tmpdir } from "node:os";
+import { createHash } from "node:crypto";
+import { stripDeterministicHeader } from "../compiler/primitives/header.ts";
+import { canonicalJson, serializeCanonical } from "../compiler/primitives/serialize.ts";
 import { createDiagnostic } from "../compiler/diagnostics/create.ts";
 import type { Diagnostic } from "../compiler/types/diagnostic.ts";
-import type { VerifyOptions, VerifyProfile, VerifyResult, VerifyStep } from "../compiler/types/cli.ts";
+import type { TestCost, TestGraph } from "../compiler/types/test-graph.ts";
+import type {
+  VerifyOptions,
+  VerifyProfile,
+  VerifyResult,
+  VerifyStep,
+  VerifyTestGraphDurationSource,
+  VerifyTestGraphLane,
+  VerifyTestGraphPlan,
+  VerifyTestGraphPlanChunk,
+} from "../compiler/types/cli.ts";
 import {
+  FORGE_VERIFY_NO_TESTS_SELECTED,
   FORGE_VERIFY_POLICY,
   FORGE_VERIFY_SCRIPT_TIMEOUT,
 } from "../compiler/diagnostics/codes.ts";
 import { detectPackageManager } from "../compiler/package-manager/detect.ts";
-import { resolvePackageManagerArgv } from "../compiler/package-manager/executor.ts";
+import { resolveCommandArgv, resolvePackageManagerArgv } from "../compiler/package-manager/executor.ts";
 import { runCheckCommand, runGenerateCommand } from "./commands.ts";
 import { lintForgeGuards } from "./lint-forge.ts";
 import { runPolicyCommand } from "./policy.ts";
 import { runAuthCommand } from "./auth.ts";
 import { runRlsCommand } from "./rls.ts";
 import { buildImpactTestPlan, diagnosticsForImpactTestRun, runImpactTestPlan } from "../impact/index.ts";
+import type { TestRunRecord, TestRunStep } from "../impact/types.ts";
 import { runAgentCheck } from "../agent-adapters/index.ts";
 import type { AgentAdapterTarget } from "../agent-adapters/types.ts";
 
@@ -26,6 +43,28 @@ interface PackageScripts {
 }
 
 const DEFAULT_SCRIPT_TIMEOUT_MS = 30 * 60 * 1000;
+type TypecheckerChoice = "tsc" | "native" | "ts7" | "tsgo" | "auto";
+
+interface ScriptRunResult {
+  exitCode: number;
+  stdout: string;
+  stderr: string;
+  command: string;
+  durationMs: number;
+  timedOut: boolean;
+  spawnError?: boolean;
+}
+
+interface PackageJsonWithBin {
+  version?: unknown;
+  bin?: unknown;
+}
+
+interface TypecheckCandidate {
+  label: string;
+  argv: string[];
+  command: string;
+}
 
 function readPackageScripts(workspaceRoot: string): PackageScripts {
   const packageJsonPath = join(workspaceRoot, "package.json");
@@ -43,33 +82,78 @@ function readPackageScripts(workspaceRoot: string): PackageScripts {
   }
 }
 
+function readWorkspacePackageJson(workspaceRoot: string): Record<string, unknown> {
+  const packageJsonPath = join(workspaceRoot, "package.json");
+  if (!nodeFileSystem.exists(packageJsonPath)) {
+    return {};
+  }
+  try {
+    return JSON.parse(nodeFileSystem.readText(packageJsonPath) ?? "{}") as Record<string, unknown>;
+  } catch {
+    return {};
+  }
+}
+
+function isForgeOsFrameworkWorkspace(workspaceRoot: string): boolean {
+  const pkg = readWorkspacePackageJson(workspaceRoot);
+  return (
+    pkg.name === "forgeos" &&
+    nodeFileSystem.exists(join(workspaceRoot, "src/forge/cli/verify.ts")) &&
+    nodeFileSystem.exists(join(workspaceRoot, "bin/forge.mjs"))
+  );
+}
+
 async function spawnPackageRun(
   workspaceRoot: string,
   scriptName: string,
   timeoutMs: number,
-): Promise<{
-  exitCode: number;
-  stdout: string;
-  stderr: string;
-  command: string;
-  durationMs: number;
-  timedOut: boolean;
-}> {
+): Promise<ScriptRunResult> {
   const packageManager = detectPackageManager(workspaceRoot);
   let argv = resolvePackageManagerArgv([packageManager, "run", scriptName]);
   if (process.platform === "win32" && /\.(cmd|bat)$/i.test(argv[0] ?? "")) {
     argv = [process.env.ComSpec ?? "cmd.exe", "/d", "/c", packageManager, "run", scriptName];
   }
+  return spawnArgv(workspaceRoot, argv, timeoutMs, argv.join(" "));
+}
+
+function quoteWindowsCommandArg(value: string): string {
+  if (!/[\s"]/u.test(value)) {
+    return value;
+  }
+  return `"${value.replace(/"/g, "\"\"")}"`;
+}
+
+function wrapWindowsCommandScript(argv: string[]): string[] {
+  if (process.platform !== "win32" || !/\.(cmd|bat)$/iu.test(argv[0] ?? "")) {
+    return argv;
+  }
+  return [
+    process.env.ComSpec ?? "cmd.exe",
+    "/d",
+    "/s",
+    "/c",
+    argv.map(quoteWindowsCommandArg).join(" "),
+  ];
+}
+
+async function spawnArgv(
+  workspaceRoot: string,
+  argv: string[],
+  timeoutMs: number,
+  command = argv.join(" "),
+  envOverrides?: Record<string, string>,
+): Promise<ScriptRunResult> {
   const started = Date.now();
 
   return new Promise((resolve) => {
     let settled = false;
     let timedOut = false;
     let child: ReturnType<typeof spawn>;
+    const spawnCommand = wrapWindowsCommandScript(argv);
     try {
-      child = spawn(argv[0]!, argv.slice(1), {
+      child = spawn(spawnCommand[0]!, spawnCommand.slice(1), {
         cwd: workspaceRoot,
-        env: process.env,
+        env: envOverrides ? { ...process.env, ...envOverrides } : process.env,
         stdio: ["ignore", "pipe", "pipe"],
         windowsHide: true,
       });
@@ -78,9 +162,10 @@ async function spawnPackageRun(
         exitCode: 1,
         stdout: "",
         stderr: error instanceof Error ? error.message : String(error),
-        command: argv.join(" "),
+        command,
         durationMs: Date.now() - started,
         timedOut: false,
+        spawnError: true,
       });
       return;
     }
@@ -110,9 +195,10 @@ async function spawnPackageRun(
           exitCode: 1,
           stdout,
           stderr: error instanceof Error ? error.message : String(error),
-          command: argv.join(" "),
+          command,
           durationMs: Date.now() - started,
           timedOut,
+          spawnError: true,
         });
       }
     });
@@ -124,7 +210,7 @@ async function spawnPackageRun(
           exitCode: timedOut ? 1 : code ?? 1,
           stdout,
           stderr,
-          command: argv.join(" "),
+          command,
           durationMs: Date.now() - started,
           timedOut,
         });
@@ -137,14 +223,7 @@ async function runPackageScript(
   workspaceRoot: string,
   scriptName: string,
   timeoutMs: number,
-): Promise<{
-  exitCode: number;
-  stdout: string;
-  stderr: string;
-  command: string;
-  durationMs: number;
-  timedOut: boolean;
-}> {
+): Promise<ScriptRunResult> {
   return spawnPackageRun(workspaceRoot, scriptName, timeoutMs);
 }
 
@@ -229,7 +308,1171 @@ function packageScriptFailureDiagnostic(
   });
 }
 
+function strictGraphFailureDiagnostic(result: {
+  exitCode: number;
+  stdout: string;
+  stderr: string;
+  command: string;
+  failedFiles: string[];
+  failedChunk?: number;
+  reportPath?: string;
+}): Diagnostic {
+  const excerpt = outputExcerpt(result.stdout, result.stderr);
+  const files = result.failedFiles.slice(0, 8);
+  const hidden = Math.max(0, result.failedFiles.length - files.length);
+  const fileSummary = files.length > 0
+    ? `${files.join(", ")}${hidden > 0 ? `, ... +${hidden} more` : ""}`
+    : "unknown files";
+  const report = result.reportPath ?? ".forge/test-runs/last.json";
+  return createDiagnostic({
+    severity: "error",
+    code: "FORGE_VERIFY_TESTS",
+    message: `strict TestGraph failed${result.failedChunk ? ` in chunk ${result.failedChunk}` : ""} with exit code ${result.exitCode}: ${fileSummary}`,
+    fixHint: excerpt
+      ? `Inspect ${report} and rerun the failing files. Last output: ${excerpt}`
+      : `Inspect ${report} and rerun the failing files.`,
+    suggestedCommands: [
+      result.failedFiles.length > 0
+        ? `bun test ${result.failedFiles.join(" ")}`
+        : result.command,
+      "forge repair diagnose --from-last-test-run --json",
+      "forge verify --strict",
+    ],
+  });
+}
+
+function resolveTypechecker(options: VerifyOptions): TypecheckerChoice {
+  if (options.typechecker) {
+    return options.typechecker;
+  }
+  const fromEnv = process.env.FORGE_TYPECHECKER;
+  return (
+    fromEnv === "native" ||
+    fromEnv === "ts7" ||
+    fromEnv === "tsgo" ||
+    fromEnv === "auto" ||
+    fromEnv === "tsc"
+  )
+    ? fromEnv
+    : "tsc";
+}
+
+function nodeModulePackageRoot(workspaceRoot: string, packageName: string): string {
+  return join(workspaceRoot, "node_modules", ...packageName.split("/"));
+}
+
+function readNodeModulePackageJson(
+  workspaceRoot: string,
+  packageName: string,
+): PackageJsonWithBin | undefined {
+  const packageJsonPath = join(nodeModulePackageRoot(workspaceRoot, packageName), "package.json");
+  if (!nodeFileSystem.exists(packageJsonPath)) {
+    return undefined;
+  }
+
+  try {
+    return JSON.parse(nodeFileSystem.readText(packageJsonPath) ?? "{}") as PackageJsonWithBin;
+  } catch {
+    return undefined;
+  }
+}
+
+function packageVersion(workspaceRoot: string, packageName: string): string | undefined {
+  const version = readNodeModulePackageJson(workspaceRoot, packageName)?.version;
+  return typeof version === "string" ? version : undefined;
+}
+
+function packageMajorVersion(workspaceRoot: string, packageName: string): number | undefined {
+  const version = packageVersion(workspaceRoot, packageName);
+  const match = version?.match(/^(\d+)/u);
+  if (!match) {
+    return undefined;
+  }
+  const parsed = Number(match[1]);
+  return Number.isInteger(parsed) ? parsed : undefined;
+}
+
+function packageBinPath(workspaceRoot: string, packageName: string, binName: string): string | undefined {
+  const packageRoot = nodeModulePackageRoot(workspaceRoot, packageName);
+  const packageJson = readNodeModulePackageJson(workspaceRoot, packageName);
+  if (!packageJson) {
+    return undefined;
+  }
+
+  let relativeBin: string | undefined;
+  if (typeof packageJson.bin === "string") {
+    relativeBin = packageJson.bin;
+  } else if (packageJson.bin && typeof packageJson.bin === "object") {
+    const value = (packageJson.bin as Record<string, unknown>)[binName];
+    relativeBin = typeof value === "string" ? value : undefined;
+  }
+
+  const candidates = [
+    relativeBin ? join(packageRoot, relativeBin) : undefined,
+    join(packageRoot, "bin", binName),
+  ].filter((candidate): candidate is string => typeof candidate === "string");
+
+  return candidates.find((candidate) => nodeFileSystem.exists(candidate));
+}
+
+function isLikelyPath(value: string): boolean {
+  return value.includes("/") || value.includes("\\") || /^[a-z]:/iu.test(value);
+}
+
+function isNodeRunnableBin(executable: string): boolean {
+  if (/\.(cjs|js|mjs)$/iu.test(executable)) {
+    return true;
+  }
+  if (!nodeFileSystem.exists(executable)) {
+    return false;
+  }
+  try {
+    const head = (nodeFileSystem.readText(executable) ?? "").slice(0, 256);
+    const firstLine = head.split(/\r?\n/u)[0] ?? "";
+    return firstLine.includes("node") || head.includes("require(") || head.includes("import ");
+  } catch {
+    return false;
+  }
+}
+
+function argvForExecutable(executable: string, args: string[]): string[] {
+  const trimmed = executable.trim();
+  if (!isLikelyPath(trimmed)) {
+    return resolveCommandArgv([trimmed, ...args]);
+  }
+  return isNodeRunnableBin(trimmed) ? [process.execPath, trimmed, ...args] : [trimmed, ...args];
+}
+
+function argvForPackageBin(binPath: string, args: string[]): string[] {
+  return isNodeRunnableBin(binPath) ? [process.execPath, binPath, ...args] : [binPath, ...args];
+}
+
+function positiveIntegerEnv(name: string): string | undefined {
+  const value = process.env[name]?.trim();
+  if (!value) {
+    return undefined;
+  }
+  const parsed = Number(value);
+  return Number.isInteger(parsed) && parsed >= 1 ? String(parsed) : undefined;
+}
+
+function nativeTypecheckArgs(): string[] {
+  const args = ["--noEmit"];
+  const checkers = positiveIntegerEnv("FORGE_TS7_CHECKERS");
+  const builders = positiveIntegerEnv("FORGE_TS7_BUILDERS");
+  const singleThreaded = process.env.FORGE_TS7_SINGLE_THREADED?.trim().toLowerCase();
+  if (checkers) {
+    args.push("--checkers", checkers);
+  }
+  if (builders) {
+    args.push("--builders", builders);
+  }
+  if (singleThreaded === "1" || singleThreaded === "true" || singleThreaded === "yes") {
+    args.push("--singleThreaded");
+  }
+  return args;
+}
+
+function nativeTypecheckCandidates(workspaceRoot: string): TypecheckCandidate[] {
+  const args = nativeTypecheckArgs();
+  const candidates: TypecheckCandidate[] = [];
+  const explicitTsc = process.env.FORGE_TS7_TSC?.trim();
+  if (explicitTsc) {
+    candidates.push({
+      label: "FORGE_TS7_TSC",
+      argv: argvForExecutable(explicitTsc, args),
+      command: `${explicitTsc} ${args.join(" ")}`,
+    });
+  }
+
+  const aliasedTs7 = packageBinPath(workspaceRoot, "typescript-7", "tsc");
+  if (aliasedTs7) {
+    candidates.push({
+      label: "typescript-7",
+      argv: argvForPackageBin(aliasedTs7, args),
+      command: "typescript-7 tsc --noEmit",
+    });
+  }
+
+  if ((packageMajorVersion(workspaceRoot, "typescript") ?? 0) >= 7) {
+    const rootTs = packageBinPath(workspaceRoot, "typescript", "tsc");
+    if (rootTs) {
+      candidates.push({
+        label: "typescript@7",
+        argv: argvForPackageBin(rootTs, args),
+        command: "typescript@7 tsc --noEmit",
+      });
+    }
+  }
+
+  const nativePreview = packageBinPath(workspaceRoot, "@typescript/native-preview", "tsgo");
+  if (nativePreview) {
+    candidates.push({
+      label: "@typescript/native-preview",
+      argv: argvForPackageBin(nativePreview, args),
+      command: "@typescript/native-preview tsgo --noEmit",
+    });
+  }
+
+  return candidates;
+}
+
+function missingNativeTypecheckResult(): ScriptRunResult {
+  return {
+    exitCode: 1,
+    stdout: "",
+    stderr: [
+      "No TypeScript native checker was found.",
+      "Install an aliased RC with `npm install -D typescript-7@npm:typescript@rc`,",
+      "set FORGE_TS7_TSC, or install @typescript/native-preview.",
+    ].join(" "),
+    command: "typescript native --noEmit",
+    durationMs: 0,
+    timedOut: false,
+    spawnError: true,
+  };
+}
+
+async function runTscTypecheck(
+  workspaceRoot: string,
+  scripts: PackageScripts,
+  timeoutMs: number,
+): Promise<ScriptRunResult> {
+  if (scripts.typecheck) {
+    return runPackageScript(workspaceRoot, "typecheck", timeoutMs);
+  }
+  const argv = resolveCommandArgv(["tsc", "--noEmit"]);
+  return spawnArgv(workspaceRoot, argv, timeoutMs, "tsc --noEmit");
+}
+
+async function runNativeTypecheck(workspaceRoot: string, timeoutMs: number): Promise<ScriptRunResult> {
+  const [candidate] = nativeTypecheckCandidates(workspaceRoot);
+  if (!candidate) {
+    return missingNativeTypecheckResult();
+  }
+  return spawnArgv(workspaceRoot, candidate.argv, timeoutMs, candidate.command);
+}
+
+async function runTsgoTypecheck(workspaceRoot: string, timeoutMs: number): Promise<ScriptRunResult> {
+  const args = nativeTypecheckArgs();
+  const nativePreview = packageBinPath(workspaceRoot, "@typescript/native-preview", "tsgo");
+  if (nativePreview) {
+    return spawnArgv(
+      workspaceRoot,
+      argvForPackageBin(nativePreview, args),
+      timeoutMs,
+      "@typescript/native-preview tsgo --noEmit",
+    );
+  }
+  const argv = resolveCommandArgv(["tsgo", ...args]);
+  return spawnArgv(workspaceRoot, argv, timeoutMs, "tsgo --noEmit");
+}
+
+function typecheckAttemptSummary(label: string, result: ScriptRunResult): string {
+  if (result.timedOut) {
+    return `${label}: timed out`;
+  }
+  if (result.spawnError) {
+    return `${label}: command unavailable`;
+  }
+  return `${label}: exit code ${result.exitCode}`;
+}
+
+function typecheckerFallbackDiagnostic(
+  choice: TypecheckerChoice,
+  attempts: Array<{ label: string; result: ScriptRunResult }>,
+): Diagnostic {
+  const excerpt = attempts
+    .map((attempt) => outputExcerpt(attempt.result.stdout, attempt.result.stderr))
+    .find(Boolean);
+  return createDiagnostic({
+    severity: "warning",
+    code: "FORGE_VERIFY_TYPECHECKER_FALLBACK",
+    message: `${choice} typecheck failed; fell back to tsc (${attempts
+      .map((attempt) => typecheckAttemptSummary(attempt.label, attempt.result))
+      .join("; ")})`,
+    fixHint: excerpt ? `Last native output: ${excerpt}` : undefined,
+    suggestedCommands: [
+      "npm install -D typescript-7@npm:typescript@rc",
+      "npm install -D @typescript/native-preview",
+      "forge verify --typechecker tsc",
+    ],
+  });
+}
+
+async function runPreferredTypecheck(
+  options: VerifyOptions,
+  scripts: PackageScripts,
+  timeoutMs: number,
+): Promise<{ result: ScriptRunResult; diagnostics: Diagnostic[]; label: string }> {
+  const choice = resolveTypechecker(options);
+  if (choice === "tsc") {
+    return { result: await runTscTypecheck(options.workspaceRoot, scripts, timeoutMs), diagnostics: [], label: "tsc" };
+  }
+
+  const attempts: Array<{ label: string; result: ScriptRunResult }> = [];
+  if (choice === "native" || choice === "ts7" || choice === "auto") {
+    const native = await runNativeTypecheck(options.workspaceRoot, timeoutMs);
+    if (native.exitCode === 0) {
+      return {
+        result: native,
+        diagnostics: [],
+        label: choice === "auto" ? "auto->native" : choice,
+      };
+    }
+    attempts.push({ label: "native", result: native });
+  }
+
+  if (choice === "tsgo" || choice === "auto") {
+    const tsgo = await runTsgoTypecheck(options.workspaceRoot, timeoutMs);
+    if (tsgo.exitCode === 0) {
+      return {
+        result: tsgo,
+        diagnostics: [],
+        label: choice === "auto" ? "auto->tsgo" : "tsgo",
+      };
+    }
+    attempts.push({ label: "tsgo", result: tsgo });
+  }
+
+  const fallback = await runTscTypecheck(options.workspaceRoot, scripts, timeoutMs);
+  return {
+    result: fallback,
+    diagnostics: [typecheckerFallbackDiagnostic(choice, attempts)],
+    label: `${choice}->tsc`,
+  };
+}
+
+const STRICT_TEST_COSTS: TestCost[] = ["instant", "fast", "standard", "slow"];
+const STRICT_TEST_CHUNK_SIZE = 12;
+const STRICT_TEST_MAX_DEFAULT_JOBS = 6;
+// The isolated lane (one heavy file per chunk: node-compat, dev-server, CLI) is
+// the makespan bottleneck, so it gets more default concurrency than before. The
+// overall budget is still capped by STRICT_TEST_MAX_DEFAULT_JOBS and CPU count.
+const STRICT_ISOLATED_TEST_MAX_DEFAULT_JOBS = 4;
+const TESTGRAPH_PROFILE_RELATIVE_PATH = ".forge/test-runs/testgraph-profile.json";
+const TEST_COST_FALLBACK_MS: Record<TestCost, number> = {
+  instant: 250,
+  fast: 1_000,
+  standard: 3_000,
+  slow: 12_000,
+  docker: 60_000,
+  browser: 60_000,
+};
+const TEST_COST_RANK: Record<TestCost, number> = {
+  instant: 0,
+  fast: 1,
+  standard: 2,
+  slow: 3,
+  docker: 4,
+  browser: 5,
+};
+const STRICT_TEST_FALLBACK_MS_BY_PATH: Array<{ pattern: RegExp; estimatedMs: number }> = [
+  { pattern: /^tests\/cli\/node-compat\.test\.ts$/, estimatedMs: 12_000 },
+  { pattern: /^tests\/cli\/node-compat-dev-server\.test\.ts$/, estimatedMs: 6_000 },
+  { pattern: /^tests\/cli\/node-compat-new\.test\.ts$/, estimatedMs: 8_000 },
+  { pattern: /^tests\/cli\/cli\.test\.ts$/, estimatedMs: 3_000 },
+  { pattern: /^tests\/cli\/cli-generation\.test\.ts$/, estimatedMs: 12_000 },
+  { pattern: /^tests\/cli\/cli-verify\.test\.ts$/, estimatedMs: 12_000 },
+  { pattern: /^tests\/cli\/cli-verify-changed\.test\.ts$/, estimatedMs: 5_000 },
+  { pattern: /^tests\/db\/pglite-adapter\.test\.ts$/, estimatedMs: 12_000 },
+  { pattern: /^tests\/dev\/dev-workflow-worker\.test\.ts$/, estimatedMs: 6_000 },
+  { pattern: /^tests\/external-manifest\/external-runtime-bridge\.test\.ts$/, estimatedMs: 4_000 },
+  { pattern: /^tests\/external-manifest\/external-runtime-cli\.test\.ts$/, estimatedMs: 6_000 },
+  { pattern: /^tests\/external-manifest\/external-runtime-node-cli\.test\.ts$/, estimatedMs: 12_000 },
+  { pattern: /^tests\/external-manifest\/go-adapter-conformance\.test\.ts$/, estimatedMs: 5_000 },
+  { pattern: /^tests\/external-manifest\/java-adapter-conformance\.test\.ts$/, estimatedMs: 20_000 },
+  { pattern: /^tests\/impact\/h28-impact\.test\.ts$/, estimatedMs: 8_000 },
+  { pattern: /^tests\/impact\/h28-impact-runner\.test\.ts$/, estimatedMs: 7_000 },
+  { pattern: /^tests\/impact\/h28-impact-runner-diagnostics\.test\.ts$/, estimatedMs: 3_000 },
+  { pattern: /^tests\/refactor\/h27-refactor\.test\.ts$/, estimatedMs: 6_000 },
+  { pattern: /^tests\/refactor\/h27-refactor-extract-action-apply\.test\.ts$/, estimatedMs: 10_000 },
+  { pattern: /^tests\/refactor\/h27-refactor-extract-action\.test\.ts$/, estimatedMs: 21_000 },
+  { pattern: /^tests\/refactor\/h27-refactor-extract-action-bindings\.test\.ts$/, estimatedMs: 10_000 },
+  { pattern: /^tests\/release\/h23-release-artifacts\.test\.ts$/, estimatedMs: 8_000 },
+  { pattern: /^tests\/release\/h23-release-self-host\.test\.ts$/, estimatedMs: 4_000 },
+  { pattern: /^tests\/release\/h23-release\.test\.ts$/, estimatedMs: 3_000 },
+  { pattern: /^tests\/templates\/new-b2b-support-web\.test\.ts$/, estimatedMs: 12_000 },
+  { pattern: /^tests\/templates\/new-agent-workroom\.test\.ts$/, estimatedMs: 12_000 },
+  { pattern: /^tests\/templates\/new-minimal-web\.test\.ts$/, estimatedMs: 12_000 },
+  { pattern: /^tests\/templates\/create-forge-app\.test\.ts$/, estimatedMs: 8_000 },
+];
+const STRICT_ISOLATED_TEST_PATTERNS = [
+  /^tests\/ai\//,
+  /^tests\/cli\/cli-generation\.test\.ts$/,
+  /^tests\/cli\/cli\.test\.ts$/,
+  /^tests\/cli\/cli-verify\.test\.ts$/,
+  /^tests\/cli\/cli-verify-changed\.test\.ts$/,
+  /^tests\/cli\/node-compat-dev-server\.test\.ts$/,
+  /^tests\/cli\/node-compat-new\.test\.ts$/,
+  /^tests\/cli\/windows\.test\.ts$/,
+  /^tests\/client\//,
+  /^tests\/db\/pglite-adapter\.test\.ts$/,
+  /^tests\/dev\//,
+  /^tests\/external-manifest\/external-manifest\.test\.ts$/,
+  /^tests\/external-manifest\/go-adapter-conformance\.test\.ts$/,
+  /^tests\/external-manifest\/java-adapter-conformance\.test\.ts$/,
+  /^tests\/external-manifest\/external-runtime-bridge\.test\.ts$/,
+  /^tests\/external-manifest\/external-runtime-node-cli\.test\.ts$/,
+  /^tests\/impact\/h28-impact\.test\.ts$/,
+  /^tests\/impact\/h28-impact-runner\.test\.ts$/,
+  /^tests\/impact\/h28-impact-runner-diagnostics\.test\.ts$/,
+  /^tests\/live\//,
+  /^tests\/queries\/query-dev-server\.test\.ts$/,
+  // refactor extract-action/rename tests use ts.createProgram fresh per call
+  // against isolated temp workspaces (no shared global or server state), so they
+  // run safely co-located in the parallel lane and share one process warm-up
+  // instead of paying a cold start per isolated chunk.
+  /^tests\/release\/h23-release-artifacts\.test\.ts$/,
+  /^tests\/release\/h23-release-self-host\.test\.ts$/,
+  /^tests\/release\/h23-release\.test\.ts$/,
+  /^tests\/security\/tenant-isolation\/http-runtime\.test\.ts$/,
+  /^tests\/templates\/new-b2b-support-web\.test\.ts$/,
+  /^tests\/templates\/new-agent-workroom\.test\.ts$/,
+  /^tests\/templates\/new-minimal-web\.test\.ts$/,
+  /^tests\/telemetry\/telemetry-dev-server\.test\.ts$/,
+];
+const STRICT_SERIAL_TEST_PATTERNS: RegExp[] = [];
+
+interface StrictTestEntry {
+  file: string;
+  cost: TestCost;
+  lane: StrictTestLane;
+  estimatedMs: number;
+  durationSource: VerifyTestGraphDurationSource;
+}
+
+interface StrictGraphChunkResult extends ScriptRunResult {
+  files: string[];
+  lane: StrictTestLane;
+  chunkIndex: number;
+  chunkCount: number;
+}
+
+interface TestGraphProfileFile {
+  schemaVersion: "0.1.0";
+  updatedAt: string;
+  files: Record<string, {
+    durationMs: number;
+    runs: number;
+    lane: StrictTestLane;
+    sourceHash?: string;
+    lastExitCode: number;
+    lastRunAt: string;
+  }>;
+}
+
+function readTestGraph(workspaceRoot: string): TestGraph | null {
+  const raw = nodeFileSystem.readText(join(workspaceRoot, "src/forge/_generated/testGraph.json"));
+  if (!raw) {
+    return null;
+  }
+  return JSON.parse(stripDeterministicHeader(raw)) as TestGraph;
+}
+
+function strictTestEntries(workspaceRoot: string): Array<{ file: string; cost: TestCost }> {
+  const graph = readTestGraph(workspaceRoot);
+  if (!graph) {
+    return [];
+  }
+  const byFile = new Map<string, TestCost>();
+  for (const test of graph.tests) {
+    if (!STRICT_TEST_COSTS.includes(test.cost)) {
+      continue;
+    }
+    const existing = byFile.get(test.file);
+    if (!existing || TEST_COST_RANK[test.cost] > TEST_COST_RANK[existing]) {
+      byFile.set(test.file, test.cost);
+    }
+  }
+  return [...byFile.entries()]
+    .map(([file, cost]) => ({ file, cost }))
+    .sort((left, right) => left.file.localeCompare(right.file));
+}
+
+export function chunkFiles(files: string[], size: number): string[][] {
+  const chunks: string[][] = [];
+  for (let index = 0; index < files.length; index += size) {
+    chunks.push(files.slice(index, index + size));
+  }
+  return chunks;
+}
+
+export function resolveStrictTestJobs(options: {
+  requested?: number;
+  env?: NodeJS.ProcessEnv;
+  chunkCount: number;
+}): number {
+  if (options.chunkCount <= 1) {
+    return 1;
+  }
+  const fromEnv = options.env?.FORGE_VERIFY_TEST_JOBS;
+  const parsedEnv = fromEnv ? Number(fromEnv) : undefined;
+  const requested = options.requested ?? parsedEnv;
+  if (requested !== undefined && Number.isInteger(requested) && requested >= 1) {
+    return Math.min(requested, options.chunkCount);
+  }
+
+  const cpuBound = Math.max(2, Math.floor(availableParallelism() / 2));
+  return Math.min(STRICT_TEST_MAX_DEFAULT_JOBS, cpuBound, options.chunkCount);
+}
+
+function resolveStrictLaneJobs(options: {
+  totalJobs: number;
+  parallelChunkCount: number;
+  isolatedChunkCount: number;
+  env?: NodeJS.ProcessEnv;
+}): { parallelJobs: number; isolatedJobs: number } {
+  if (options.parallelChunkCount === 0) {
+    return {
+      parallelJobs: 0,
+      isolatedJobs: resolveStrictIsolatedTestJobs({
+        env: options.env,
+        chunkCount: Math.min(options.totalJobs, options.isolatedChunkCount),
+      }),
+    };
+  }
+  if (options.isolatedChunkCount === 0) {
+    return {
+      parallelJobs: Math.min(options.totalJobs, options.parallelChunkCount),
+      isolatedJobs: 0,
+    };
+  }
+  const requestedIsolated = resolveStrictIsolatedTestJobs({
+    env: options.env,
+    chunkCount: options.isolatedChunkCount,
+  });
+  const isolatedJobs = Math.min(
+    requestedIsolated,
+    options.isolatedChunkCount,
+    Math.max(1, options.totalJobs - 1),
+  );
+  const parallelJobs = Math.min(
+    options.parallelChunkCount,
+    Math.max(1, options.totalJobs - isolatedJobs),
+  );
+  return { parallelJobs, isolatedJobs };
+}
+
+export function resolveStrictIsolatedTestJobs(options: {
+  requested?: number;
+  env?: NodeJS.ProcessEnv;
+  chunkCount: number;
+}): number {
+  if (options.chunkCount <= 1) {
+    return 1;
+  }
+  const fromEnv = options.env?.FORGE_VERIFY_ISOLATED_TEST_JOBS;
+  const parsedEnv = fromEnv ? Number(fromEnv) : undefined;
+  const requested = options.requested ?? parsedEnv;
+  if (requested !== undefined && Number.isInteger(requested) && requested >= 1) {
+    return Math.min(requested, options.chunkCount);
+  }
+  return Math.min(STRICT_ISOLATED_TEST_MAX_DEFAULT_JOBS, options.chunkCount);
+}
+
+function normalizeTestPath(file: string): string {
+  return file.replace(/\\/g, "/");
+}
+
+export type StrictTestLane = VerifyTestGraphLane;
+
+export function classifyStrictTestFile(file: string): StrictTestLane {
+  const normalized = normalizeTestPath(file);
+  if (STRICT_SERIAL_TEST_PATTERNS.some((pattern) => pattern.test(normalized))) {
+    return "serial";
+  }
+  if (STRICT_ISOLATED_TEST_PATTERNS.some((pattern) => pattern.test(normalized))) {
+    return "isolated";
+  }
+  return "parallel";
+}
+
+function testGraphProfilePath(workspaceRoot: string): string {
+  return join(workspaceRoot, TESTGRAPH_PROFILE_RELATIVE_PATH);
+}
+
+function testFileSourceHash(workspaceRoot: string, file: string): string | null {
+  const source = nodeFileSystem.readText(join(workspaceRoot, file));
+  if (source === null) {
+    return null;
+  }
+  return createHash("sha256")
+    .update(normalizeTestPath(file))
+    .update("\0")
+    .update(source)
+    .digest("hex")
+    .slice(0, 16);
+}
+
+function readTestGraphProfile(workspaceRoot: string): TestGraphProfileFile | null {
+  const raw = nodeFileSystem.readText(testGraphProfilePath(workspaceRoot));
+  if (!raw) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(raw) as TestGraphProfileFile;
+    if (parsed.schemaVersion !== "0.1.0" || typeof parsed.files !== "object") {
+      return null;
+    }
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+
+function estimateStrictTestEntry(
+  workspaceRoot: string,
+  file: string,
+  cost: TestCost,
+  lane: StrictTestLane,
+  profile: TestGraphProfileFile | null,
+): { estimatedMs: number; source: VerifyTestGraphDurationSource } {
+  const profiled = profile?.files[file];
+  const sourceHash = testFileSourceHash(workspaceRoot, file);
+  if (
+    profiled &&
+    sourceHash !== null &&
+    profiled.sourceHash === sourceHash &&
+    Number.isFinite(profiled.durationMs) &&
+    profiled.durationMs > 0
+  ) {
+    return { estimatedMs: Math.max(1, Math.round(profiled.durationMs)), source: "profile" };
+  }
+  const normalized = normalizeTestPath(file);
+  const pathOverride = STRICT_TEST_FALLBACK_MS_BY_PATH.find((entry) => entry.pattern.test(normalized));
+  const fallback = pathOverride?.estimatedMs ?? TEST_COST_FALLBACK_MS[cost] ?? TEST_COST_FALLBACK_MS.standard;
+  if (lane === "serial") {
+    return { estimatedMs: Math.max(fallback, 8_000), source: "fallback" };
+  }
+  if (lane === "isolated") {
+    return { estimatedMs: Math.max(fallback, 3_000), source: "fallback" };
+  }
+  return { estimatedMs: fallback, source: "fallback" };
+}
+
+function weightedStrictTestEntries(
+  workspaceRoot: string,
+  profile: TestGraphProfileFile | null,
+): StrictTestEntry[] {
+  return strictTestEntries(workspaceRoot).map(({ file, cost }) => {
+    const lane = classifyStrictTestFile(file);
+    const estimate = estimateStrictTestEntry(workspaceRoot, file, cost, lane, profile);
+    return {
+      file,
+      cost,
+      lane,
+      estimatedMs: estimate.estimatedMs,
+      durationSource: estimate.source,
+    };
+  });
+}
+
+function partitionStrictTestEntries(entries: StrictTestEntry[]): {
+  parallel: StrictTestEntry[];
+  isolated: StrictTestEntry[];
+  serial: StrictTestEntry[];
+} {
+  const parallel: StrictTestEntry[] = [];
+  const isolated: StrictTestEntry[] = [];
+  const serial: StrictTestEntry[] = [];
+  for (const entry of entries) {
+    const lane = entry.lane;
+    if (lane === "serial") {
+      serial.push(entry);
+      continue;
+    }
+    if (lane === "isolated") {
+      isolated.push(entry);
+      continue;
+    }
+    parallel.push(entry);
+  }
+  return { parallel, isolated, serial };
+}
+
+export function packWeightedStrictTestChunks(
+  entries: Array<{ file: string; estimatedMs: number; durationSource: VerifyTestGraphDurationSource }>,
+  size: number,
+): Array<{ files: string[]; estimatedMs: number; durationSource: VerifyTestGraphDurationSource }> {
+  if (entries.length === 0) {
+    return [];
+  }
+  const binCount = Math.max(1, Math.ceil(entries.length / Math.max(1, size)));
+  const bins = Array.from({ length: binCount }, () => ({
+    files: [] as string[],
+    estimatedMs: 0,
+    durationSource: "profile" as VerifyTestGraphDurationSource,
+  }));
+  const ordered = [...entries].sort((left, right) => {
+    const byEstimate = right.estimatedMs - left.estimatedMs;
+    return byEstimate !== 0 ? byEstimate : left.file.localeCompare(right.file);
+  });
+  for (const entry of ordered) {
+    const target = bins
+      .filter((bin) => bin.files.length < size)
+      .sort((left, right) => {
+        const byEstimate = left.estimatedMs - right.estimatedMs;
+        return byEstimate !== 0 ? byEstimate : left.files.length - right.files.length;
+      })[0] ?? bins[0]!;
+    target.files.push(entry.file);
+    target.files.sort();
+    target.estimatedMs += entry.estimatedMs;
+    if (entry.durationSource === "fallback") {
+      target.durationSource = "fallback";
+    }
+  }
+  return bins.filter((bin) => bin.files.length > 0);
+}
+
+function oneFileChunks(
+  entries: StrictTestEntry[],
+): Array<{ files: string[]; estimatedMs: number; durationSource: VerifyTestGraphDurationSource }> {
+  return [...entries]
+    .sort((left, right) => {
+      const byEstimate = right.estimatedMs - left.estimatedMs;
+      return byEstimate !== 0 ? byEstimate : left.file.localeCompare(right.file);
+    })
+    .map((entry) => ({
+      files: [entry.file],
+      estimatedMs: entry.estimatedMs,
+      durationSource: entry.durationSource,
+    }));
+}
+
+function laneEstimate(chunks: VerifyTestGraphPlanChunk[], jobs: number): number {
+  const workers = Array.from({ length: Math.max(1, jobs) }, () => 0);
+  for (const chunk of chunks) {
+    workers.sort((left, right) => left - right);
+    workers[0] += chunk.estimatedMs;
+  }
+  return Math.max(...workers, 0);
+}
+
+function strictPlanRecommendations(plan: VerifyTestGraphPlan): string[] {
+  const recommendations: string[] = [];
+  if (!plan.profileFound) {
+    recommendations.push(`Run forge verify --strict once to create ${TESTGRAPH_PROFILE_RELATIVE_PATH}; later plans use measured durations.`);
+  }
+  if (plan.lanes.serial.chunkCount > 0 && plan.lanes.serial.estimatedMs > plan.criticalPathEstimateMs * 0.35) {
+    recommendations.push("Split or de-globalize the slowest serial tests; serial work is now the main critical-path limiter.");
+  } else if (plan.lanes.serial.chunkCount === 0 && plan.lanes.isolated.chunkCount > 0) {
+    recommendations.push("No current strict TestGraph files require the serial lane; optimize isolated runtime/template tests next.");
+  }
+  if (plan.lanes.isolated.chunkCount > 0 && plan.isolatedJobs < STRICT_ISOLATED_TEST_MAX_DEFAULT_JOBS) {
+    recommendations.push(`Set FORGE_VERIFY_ISOLATED_TEST_JOBS=${STRICT_ISOLATED_TEST_MAX_DEFAULT_JOBS} on machines that can run isolated runtime tests concurrently.`);
+  }
+  const slowest = plan.slowestFiles[0];
+  if (slowest) {
+    recommendations.push(`Inspect ${slowest.file}; it is currently the heaviest estimated TestGraph file.`);
+  }
+  return recommendations;
+}
+
+export function buildStrictTestGraphPlan(
+  workspaceRoot: string,
+  testJobs?: number,
+  env: NodeJS.ProcessEnv = process.env,
+): VerifyTestGraphPlan {
+  const profile = readTestGraphProfile(workspaceRoot);
+  const entries = weightedStrictTestEntries(workspaceRoot, profile);
+  const partitioned = partitionStrictTestEntries(entries);
+  const parallelRaw = packWeightedStrictTestChunks(partitioned.parallel, STRICT_TEST_CHUNK_SIZE);
+  const isolatedRaw = oneFileChunks(partitioned.isolated);
+  const serialRaw = oneFileChunks(partitioned.serial);
+  const totalJobs = resolveStrictTestJobs({
+    requested: testJobs,
+    env,
+    chunkCount: parallelRaw.length + isolatedRaw.length,
+  });
+  const { parallelJobs, isolatedJobs } = resolveStrictLaneJobs({
+    totalJobs,
+    parallelChunkCount: parallelRaw.length,
+    isolatedChunkCount: isolatedRaw.length,
+    env,
+  });
+  let index = 1;
+  const toPlanChunks = (
+    lane: StrictTestLane,
+    chunks: Array<{ files: string[]; estimatedMs: number; durationSource: VerifyTestGraphDurationSource }>,
+  ): VerifyTestGraphPlanChunk[] => chunks.map((chunk) => ({
+    index: index++,
+    lane,
+    files: chunk.files,
+    estimatedMs: chunk.estimatedMs,
+    durationSource: chunk.durationSource,
+  }));
+  const parallelChunks = toPlanChunks("parallel", parallelRaw);
+  const isolatedChunks = toPlanChunks("isolated", isolatedRaw);
+  const serialChunks = toPlanChunks("serial", serialRaw);
+  const laneMode =
+    totalJobs <= 1 && parallelChunks.length > 0 && isolatedChunks.length > 0
+      ? "sequential"
+      : "overlap";
+  const chunks = [...parallelChunks, ...isolatedChunks, ...serialChunks];
+  const lanes = {
+    parallel: {
+      fileCount: partitioned.parallel.length,
+      chunkCount: parallelChunks.length,
+      estimatedMs: parallelChunks.reduce((sum, chunk) => sum + chunk.estimatedMs, 0),
+    },
+    isolated: {
+      fileCount: partitioned.isolated.length,
+      chunkCount: isolatedChunks.length,
+      estimatedMs: isolatedChunks.reduce((sum, chunk) => sum + chunk.estimatedMs, 0),
+    },
+    serial: {
+      fileCount: partitioned.serial.length,
+      chunkCount: serialChunks.length,
+      estimatedMs: serialChunks.reduce((sum, chunk) => sum + chunk.estimatedMs, 0),
+    },
+  };
+  const plan: VerifyTestGraphPlan = {
+    schemaVersion: "0.1.0",
+    fileCount: entries.length,
+    chunkCount: chunks.length,
+    totalJobs,
+    laneMode,
+    jobs: parallelJobs,
+    isolatedJobs,
+    lanes,
+    chunks,
+    criticalPathEstimateMs:
+      (laneMode === "sequential"
+        ? laneEstimate(parallelChunks, parallelJobs) + laneEstimate(isolatedChunks, isolatedJobs)
+        : Math.max(
+          laneEstimate(parallelChunks, parallelJobs),
+          laneEstimate(isolatedChunks, isolatedJobs),
+        )) +
+      lanes.serial.estimatedMs,
+    profilePath: TESTGRAPH_PROFILE_RELATIVE_PATH,
+    profileFound: profile !== null,
+    slowestFiles: [...entries]
+      .sort((left, right) => {
+        const byEstimate = right.estimatedMs - left.estimatedMs;
+        return byEstimate !== 0 ? byEstimate : left.file.localeCompare(right.file);
+      })
+      .slice(0, 10)
+      .map((entry) => ({
+        file: entry.file,
+        lane: entry.lane,
+        estimatedMs: entry.estimatedMs,
+        source: entry.durationSource,
+      })),
+    recommendations: [],
+  };
+  plan.recommendations = strictPlanRecommendations(plan);
+  return plan;
+}
+
+async function runStrictGraphChunkPool(
+  workspaceRoot: string,
+  chunks: VerifyTestGraphPlanChunk[],
+  timeoutMs: number,
+  jobs: number,
+  totalChunks = chunks.length,
+): Promise<{ results: Array<StrictGraphChunkResult | undefined>; timedOut: boolean }> {
+  const results: Array<StrictGraphChunkResult | undefined> = [];
+  let nextChunk = 0;
+  let stopScheduling = false;
+
+  async function runNextChunk(): Promise<void> {
+    while (!stopScheduling) {
+      const chunkIndex = nextChunk;
+      nextChunk += 1;
+      const chunk = chunks[chunkIndex];
+      if (!chunk) {
+        return;
+      }
+      const result = await runStrictGraphTestChunk(
+        workspaceRoot,
+        chunk.files,
+        chunk.index - 1,
+        totalChunks,
+        timeoutMs,
+      );
+      results[chunkIndex] = {
+        ...result,
+        files: chunk.files,
+        lane: chunk.lane,
+        chunkIndex: chunk.index,
+        chunkCount: totalChunks,
+      };
+      if (result.exitCode !== 0) {
+        stopScheduling = true;
+        return;
+      }
+    }
+  }
+
+  await Promise.all(Array.from({ length: jobs }, () => runNextChunk()));
+  return {
+    results,
+    timedOut: results.some((result) => result?.timedOut),
+  };
+}
+
+function writeTestGraphProfile(
+  workspaceRoot: string,
+  results: Array<StrictGraphChunkResult | undefined>,
+): void {
+  const existing = readTestGraphProfile(workspaceRoot);
+  const now = new Date().toISOString();
+  const files = { ...(existing?.files ?? {}) };
+  for (const result of results) {
+    if (!result || result.files.length === 0) {
+      continue;
+    }
+    const perFileDuration = Math.max(1, Math.round(result.durationMs / result.files.length));
+    for (const file of result.files) {
+      const previous = files[file];
+      files[file] = {
+        durationMs: perFileDuration,
+        runs: (previous?.runs ?? 0) + 1,
+        lane: result.lane,
+        sourceHash: testFileSourceHash(workspaceRoot, file) ?? previous?.sourceHash,
+        lastExitCode: result.exitCode,
+        lastRunAt: now,
+      };
+    }
+  }
+  const profile: TestGraphProfileFile = {
+    schemaVersion: "0.1.0",
+    updatedAt: now,
+    files,
+  };
+  const path = testGraphProfilePath(workspaceRoot);
+  nodeFileSystem.mkdirp(dirname(path));
+  nodeFileSystem.writeText(path, `${JSON.stringify(profile, null, 2)}\n`);
+}
+
+function strictGraphChunkToTestRunStep(result: StrictGraphChunkResult, timeoutMs: number): TestRunStep & {
+  files: string[];
+  lane: StrictTestLane;
+  chunkIndex: number;
+  chunkCount: number;
+  reproduceCommand: string;
+} {
+  return {
+    command: result.command,
+    ok: result.exitCode === 0,
+    exitCode: result.exitCode,
+    durationMs: result.durationMs,
+    timedOut: result.timedOut,
+    failureKind: packageScriptFailureKind(result),
+    stdout: result.stdout,
+    stderr: result.stderr,
+    files: result.files,
+    lane: result.lane,
+    chunkIndex: result.chunkIndex,
+    chunkCount: result.chunkCount,
+    reproduceCommand: `bun test ${result.files.join(" ")} --timeout ${timeoutMs}`,
+  };
+}
+
+function writeStrictGraphTestRunRecord(
+  workspaceRoot: string,
+  plan: VerifyTestGraphPlan,
+  results: StrictGraphChunkResult[],
+  timeoutMs: number,
+  durationMs: number,
+): TestRunRecord {
+  const commands = results.map((result) => result.command);
+  const record: TestRunRecord = {
+    schemaVersion: "0.1.0",
+    id: `run_${createHash("sha256")
+      .update(`${Date.now()}:${commands.join("|")}:${plan.fileCount}:${plan.chunkCount}`)
+      .digest("hex")
+      .slice(0, 12)}`,
+    changedHash: `sha256:${createHash("sha256").update(canonicalJson(plan.chunks)).digest("hex")}`,
+    planHash: `sha256:${createHash("sha256").update(canonicalJson(plan)).digest("hex")}`,
+    source: { mode: "changed", id: "verify-strict-testgraph" },
+    commands,
+    timeoutMs,
+    results: results.map((result) => strictGraphChunkToTestRunStep(result, timeoutMs)),
+    failed: results.filter((result) => result.exitCode !== 0).map((result) => result.command),
+    durationMs,
+  };
+  const runDir = join(workspaceRoot, ".forge/test-runs");
+  nodeFileSystem.mkdirp(runDir);
+  nodeFileSystem.writeText(join(runDir, "last.json"), serializeCanonical(record));
+  nodeFileSystem.writeText(join(runDir, `${record.id}.json`), serializeCanonical(record));
+  return record;
+}
+
+async function runStrictGraphTests(
+  workspaceRoot: string,
+  timeoutMs: number,
+  testJobs?: number,
+): Promise<ScriptRunResult & {
+  fileCount: number;
+  chunkCount: number;
+  jobs: number;
+  isolatedJobs: number;
+  plan: VerifyTestGraphPlan;
+  failedFiles: string[];
+  failedChunk?: number;
+  reportPath?: string;
+}> {
+  const plan = buildStrictTestGraphPlan(workspaceRoot, testJobs);
+  if (plan.fileCount === 0) {
+    return {
+      exitCode: 1,
+      stdout: "",
+      stderr: "TestGraph has no non-docker/browser tests",
+      command: "forge strict TestGraph tests",
+      durationMs: 0,
+      timedOut: false,
+      spawnError: true,
+      fileCount: 0,
+      chunkCount: 0,
+      jobs: 0,
+      isolatedJobs: 0,
+      plan,
+      failedFiles: [],
+    };
+  }
+
+  const started = Date.now();
+  let stdout = "";
+  let stderr = "";
+  let timedOut = false;
+  let exitCode = 0;
+  let failedOutput: Pick<ScriptRunResult, "stdout" | "stderr"> | null = null;
+  const parallelChunks = plan.chunks.filter((chunk) => chunk.lane === "parallel");
+  const isolatedChunks = plan.chunks.filter((chunk) => chunk.lane === "isolated");
+  const serialChunks = plan.chunks.filter((chunk) => chunk.lane === "serial");
+
+  let command = `bun test <${plan.fileCount} TestGraph files in ${plan.chunkCount} chunks, ${plan.laneMode} lanes, total jobs ${plan.totalJobs}, parallel jobs ${plan.jobs}, isolated jobs ${plan.isolatedJobs}, isolated ${isolatedChunks.length}, serial ${serialChunks.length}> --timeout ${timeoutMs}`;
+  const parallelPool = () => runStrictGraphChunkPool(
+    workspaceRoot,
+    parallelChunks,
+    timeoutMs,
+    plan.jobs,
+    plan.chunkCount,
+  );
+  const isolatedPool = () => runStrictGraphChunkPool(
+    workspaceRoot,
+    isolatedChunks,
+    timeoutMs,
+    plan.isolatedJobs,
+    plan.chunkCount,
+  );
+  const [parallelRun, isolatedRun] = plan.laneMode === "sequential"
+    ? [await parallelPool(), await isolatedPool()]
+    : await Promise.all([parallelPool(), isolatedPool()]);
+  const orderedResults: StrictGraphChunkResult[] = [];
+  for (const result of parallelRun.results) {
+    if (result) {
+      orderedResults.push(result);
+    }
+  }
+  for (const result of isolatedRun.results) {
+    if (result) {
+      orderedResults.push(result);
+    }
+  }
+  timedOut = timedOut || parallelRun.timedOut;
+  timedOut = timedOut || isolatedRun.timedOut;
+
+  if (
+    parallelRun.results.every((result) => result?.exitCode === 0) &&
+    isolatedRun.results.every((result) => result?.exitCode === 0)
+  ) {
+    for (const chunk of serialChunks) {
+      const result = await runStrictGraphTestChunk(
+        workspaceRoot,
+        chunk.files,
+        chunk.index - 1,
+        plan.chunkCount,
+        timeoutMs,
+      );
+      orderedResults.push({
+        ...result,
+        files: chunk.files,
+        lane: chunk.lane,
+        chunkIndex: chunk.index,
+        chunkCount: plan.chunkCount,
+      });
+      timedOut = timedOut || result.timedOut;
+      if (result.exitCode !== 0) {
+        break;
+      }
+    }
+  }
+
+  writeTestGraphProfile(workspaceRoot, orderedResults);
+
+  let failedResult: StrictGraphChunkResult | undefined;
+  for (const result of orderedResults) {
+    if (!result) {
+      continue;
+    }
+    stdout += result.stdout;
+    stderr += result.stderr;
+    timedOut = timedOut || result.timedOut;
+    if (result.exitCode !== 0) {
+      exitCode = result.exitCode;
+      command = result.command;
+      failedOutput = { stdout: result.stdout, stderr: result.stderr };
+      failedResult = result;
+      break;
+    }
+  }
+
+  const report = writeStrictGraphTestRunRecord(
+    workspaceRoot,
+    plan,
+    orderedResults,
+    timeoutMs,
+    Date.now() - started,
+  );
+
+  return {
+    exitCode,
+    stdout: failedOutput?.stdout ?? stdout,
+    stderr: failedOutput?.stderr ?? stderr,
+    command,
+    durationMs: Date.now() - started,
+    timedOut,
+    fileCount: plan.fileCount,
+    chunkCount: plan.chunkCount,
+    jobs: plan.jobs,
+    isolatedJobs: plan.isolatedJobs,
+    plan,
+    failedFiles: failedResult?.files ?? [],
+    failedChunk: failedResult?.chunkIndex,
+    reportPath: `.forge/test-runs/${report.id}.json`,
+  };
+}
+
+function runStrictGraphTestChunk(
+  workspaceRoot: string,
+  chunk: string[],
+  chunkIndex: number,
+  chunkCount: number,
+  timeoutMs: number,
+): Promise<ScriptRunResult> {
+  const argv = resolveCommandArgv(["bun", "test", ...chunk, "--timeout", String(timeoutMs)]);
+  const chunkCommand = `bun test <TestGraph chunk ${chunkIndex + 1}/${chunkCount}, ${chunk.length} files> --timeout ${timeoutMs}`;
+  const chunkTempDir = mkdtempSync(join(tmpdir(), `forge-testgraph-${chunkIndex + 1}-`));
+  return spawnArgv(workspaceRoot, argv, timeoutMs, chunkCommand, {
+    TMP: chunkTempDir,
+    TEMP: chunkTempDir,
+    TMPDIR: chunkTempDir,
+    FORGE_TEST_TMPDIR: chunkTempDir,
+    FORGE_VERIFY_CHUNK_INDEX: String(chunkIndex + 1),
+    FORGE_VERIFY_CHUNK_COUNT: String(chunkCount),
+    FORGE_DEV_PORT: "0",
+  }).finally(() => {
+    rmSync(chunkTempDir, { recursive: true, force: true });
+  });
+}
+
 function resolveVerifyProfile(options: VerifyOptions): VerifyProfile {
+  if (options.internal) {
+    return "internal";
+  }
   if (options.changed) {
     return "changed";
   }
@@ -247,7 +1490,7 @@ function resolveVerifyProfile(options: VerifyOptions): VerifyProfile {
 
 async function runStandardImpactTests(
   options: VerifyOptions,
-): Promise<{ steps: VerifyStep[]; diagnostics: Diagnostic[] }> {
+): Promise<{ steps: VerifyStep[]; diagnostics: Diagnostic[]; testCoverageReason?: string }> {
   const started = Date.now();
   const diagnostics: Diagnostic[] = [];
   const steps: VerifyStep[] = [];
@@ -270,8 +1513,23 @@ async function runStandardImpactTests(
   const commands = impactOnlyPlan.tests.map((test) => test.command);
 
   if (commands.length === 0) {
+    const reason = plan.derivedOnly
+      ? "changed files are derived generated artifacts only"
+      : "impact planner selected no test files for the current changes";
     steps.push(skippedStep("impact-tests", "no changed files selected an impact test"));
-    return { steps, diagnostics };
+    diagnostics.push(
+      createDiagnostic({
+        severity: "warning",
+        code: FORGE_VERIFY_NO_TESTS_SELECTED,
+        message: "standard verification did not select any impact tests; only non-test checks ran",
+        fixHint: "Run forge verify --strict when you need full test-suite coverage.",
+        suggestedCommands: [
+          "forge test plan --changed --json",
+          "forge verify --strict",
+        ],
+      }),
+    );
+    return { steps, diagnostics, testCoverageReason: reason };
   }
 
   const record = await runImpactTestPlan(options.workspaceRoot, impactOnlyPlan, {
@@ -331,6 +1589,69 @@ export async function runVerifyCommand(
   const scripts = readPackageScripts(options.workspaceRoot);
   const scriptTimeoutMs = resolveScriptTimeoutMs(options);
   const profile = resolveVerifyProfile(options);
+  const frameworkWorkspace = isForgeOsFrameworkWorkspace(options.workspaceRoot);
+  const canRunInternalTests = options.internal || !frameworkWorkspace;
+  let testGraphPlan: VerifyTestGraphPlan | undefined;
+  let testCoverageReason: string | undefined;
+
+  if (options.testPlan) {
+    if (frameworkWorkspace && !options.internal) {
+      steps.push({
+        name: "tests:framework-testgraph-plan",
+        ok: true,
+        skipped: true,
+        skipReason: "ForgeOS framework TestGraph is maintainer-only; use forge verify framework --test-plan --json",
+      });
+      diagnostics.push(
+        createDiagnostic({
+          severity: "warning",
+          code: "FORGE_VERIFY_INTERNAL_TESTS_SKIPPED",
+          message: "Skipped ForgeOS framework TestGraph plan during app-level verify.",
+          fixHint: "Run forge verify framework --test-plan --json when maintaining ForgeOS itself.",
+          suggestedCommands: [
+            "forge verify framework --test-plan --json",
+            "forge verify --standard --json",
+          ],
+        }),
+      );
+      return {
+        ok: true,
+        profile,
+        steps,
+        diagnostics,
+        durationMs: Date.now() - started,
+        exitCode: 0,
+      };
+    }
+    testGraphPlan = buildStrictTestGraphPlan(options.workspaceRoot, options.testJobs);
+    steps.push({
+      name: "tests:testgraph-plan",
+      ok: testGraphPlan.fileCount > 0,
+      skipped: false,
+      exitCode: testGraphPlan.fileCount > 0 ? 0 : 1,
+      command: `forge verify --strict --test-plan (${testGraphPlan.fileCount} files, ${testGraphPlan.chunkCount} chunks)`,
+      durationMs: Date.now() - started,
+    });
+    if (testGraphPlan.fileCount === 0) {
+      diagnostics.push(
+        createDiagnostic({
+          severity: "error",
+          code: "FORGE_VERIFY_TESTGRAPH_EMPTY",
+          message: "TestGraph has no non-docker/browser tests",
+        }),
+      );
+    }
+    const ok = steps.every((step) => step.ok);
+    return {
+      ok,
+      profile,
+      steps,
+      diagnostics,
+      testGraphPlan,
+      durationMs: Date.now() - started,
+      exitCode: ok ? 0 : 1,
+    };
+  }
 
   if (options.changed) {
     const plan = buildImpactTestPlan({
@@ -400,7 +1721,7 @@ export async function runVerifyCommand(
   printProgress(options, "verify: forge-check");
   const checkStarted = Date.now();
   const forgeCheck = await runCheckCommand(options.workspaceRoot, {
-    strictSecrets: options.strict,
+    strictSecrets: options.strict || options.internal === true,
   });
   steps.push({
     name: "forge-check",
@@ -410,7 +1731,7 @@ export async function runVerifyCommand(
   });
   diagnostics.push(...forgeCheck.errors, ...forgeCheck.warnings);
 
-  if (profile === "strict" || profile === "standard") {
+  if (profile === "strict" || profile === "standard" || profile === "internal") {
     printProgress(options, "verify: policy-check-strict");
     const policyStarted = Date.now();
     const policyCheck = await runPolicyCommand({
@@ -505,11 +1826,14 @@ export async function runVerifyCommand(
 
   if (options.skipTypecheck) {
     steps.push(skippedStep("typecheck", "--skip-typecheck"));
-  } else if (!scripts.typecheck) {
-    steps.push(skippedStep("typecheck", "no typecheck script in package.json"));
   } else {
-    printProgress(options, `verify: typecheck (${scriptTimeoutMs}ms timeout)`);
-    const typecheck = await runPackageScript(options.workspaceRoot, "typecheck", scriptTimeoutMs);
+    const typechecker = resolveTypechecker(options);
+    printProgress(options, `verify: typecheck (${typechecker}, ${scriptTimeoutMs}ms timeout)`);
+    const { result: typecheck, diagnostics: typecheckDiagnostics } = await runPreferredTypecheck(
+      options,
+      scripts,
+      scriptTimeoutMs,
+    );
     steps.push({
       name: "typecheck",
       ok: typecheck.exitCode === 0,
@@ -519,6 +1843,7 @@ export async function runVerifyCommand(
       timedOut: typecheck.timedOut,
       failureKind: packageScriptFailureKind(typecheck),
     });
+    diagnostics.push(...typecheckDiagnostics);
     if (typecheck.timedOut) {
       diagnostics.push(timedOutDiagnostic("typecheck", scriptTimeoutMs));
     } else if (typecheck.exitCode !== 0) {
@@ -537,7 +1862,70 @@ export async function runVerifyCommand(
     const impact = await runStandardImpactTests(options);
     steps.push(...impact.steps);
     diagnostics.push(...impact.diagnostics);
+    testCoverageReason = impact.testCoverageReason;
     steps.push(skippedStep("tests", "--standard uses impact-selected tests; use --strict for the full test script"));
+  } else if ((profile === "strict" || profile === "internal") && !options.fullTests) {
+    if (!canRunInternalTests) {
+      steps.push({
+        name: "tests:framework-testgraph",
+        ok: true,
+        skipped: true,
+        skipReason: "ForgeOS framework tests are maintainer-only; use forge verify framework or --internal",
+      });
+      diagnostics.push(
+        createDiagnostic({
+          severity: "warning",
+          code: "FORGE_VERIFY_INTERNAL_TESTS_SKIPPED",
+          message: "Skipped ForgeOS framework tests during app-level verify.",
+          fixHint: "Run forge verify framework when maintaining ForgeOS itself. App projects still run their own TestGraph under forge verify --strict.",
+          suggestedCommands: [
+            "forge verify framework",
+            "forge verify --internal",
+            "forge verify --standard",
+          ],
+        }),
+      );
+    } else {
+    printProgress(options, `verify: tests (strict TestGraph, ${scriptTimeoutMs}ms timeout)`);
+    const tests = await runStrictGraphTests(options.workspaceRoot, scriptTimeoutMs, options.testJobs);
+    testGraphPlan = tests.plan;
+    steps.push({
+      name: "tests:testgraph-strict",
+      ok: tests.exitCode === 0,
+      exitCode: tests.exitCode,
+      command: tests.command,
+      durationMs: tests.durationMs,
+      timedOut: tests.timedOut,
+      failureKind: packageScriptFailureKind(tests),
+    });
+    if (tests.timedOut) {
+      diagnostics.push(timedOutDiagnostic("test", scriptTimeoutMs));
+    } else if (tests.exitCode !== 0) {
+      diagnostics.push(
+        strictGraphFailureDiagnostic(tests),
+      );
+    }
+    }
+  } else if ((profile === "strict" || profile === "internal") && options.fullTests && !canRunInternalTests) {
+    steps.push({
+      name: "tests:framework-full",
+      ok: true,
+      skipped: true,
+      skipReason: "ForgeOS framework package tests are maintainer-only; use forge verify framework --full or --internal --full",
+    });
+    diagnostics.push(
+      createDiagnostic({
+        severity: "warning",
+        code: "FORGE_VERIFY_INTERNAL_TESTS_SKIPPED",
+        message: "Skipped ForgeOS framework package tests during app-level verify.",
+        fixHint: "Run forge verify framework --full when maintaining ForgeOS itself.",
+        suggestedCommands: [
+          "forge verify framework --full",
+          "forge verify --internal --full",
+          "forge verify --standard",
+        ],
+      }),
+    );
   } else if (!scripts.test) {
     steps.push(skippedStep("tests", "no test script in package.json"));
   } else {
@@ -581,6 +1969,8 @@ export async function runVerifyCommand(
     profile,
     steps,
     diagnostics,
+    testGraphPlan,
+    testCoverageReason,
     durationMs: Date.now() - started,
     exitCode: ok ? 0 : 1,
   };