@elench/testkit 0.1.108 → 0.1.109

package/README.md

@@ -35,7 +35,7 @@ npx @elench/testkit --type int
 npx @elench/testkit --type dal
 npx @elench/testkit --type e2e
 npx @elench/testkit --type int,e2e,dal
-npx @elench/testkit --type pw
+npx @elench/testkit --type ui
 
 # Parallel file execution
 npx @elench/testkit --workers 8
@@ -44,7 +44,7 @@ npx @elench/testkit --workers 8
 npx @elench/testkit --file-timeout-seconds 60
 
 # Specific service / suite
-npx @elench/testkit --service frontend --type pw -s navigation
+npx @elench/testkit --service frontend --type ui -s navigation
 npx @elench/testkit --service api --type int -s health
 npx @elench/testkit --type int,e2e,dal -s dal:queries
 
@@ -183,9 +183,8 @@ export default defineConfig({
 ```
 
 ```ts
-// playwright.config.ts
-import { defineConfig } from "@elench/testkit/playwright";
-import { devices } from "@playwright/test";
+// ui.config.ts
+import { defineConfig, devices } from "@elench/testkit/ui";
 
 export default defineConfig({
   testDir: "./__testkit__",
@@ -589,7 +588,7 @@ Example layouts:
 
 - `src/api/routes/__testkit__/auth/me.int.testkit.ts`
 - `src/db/__testkit__/sessions/count-type.dal.testkit.ts`
-- `frontend/__testkit__/navigation/navigation.pw.testkit.ts`
+- `frontend/__testkit__/navigation/navigation.ui.testkit.ts`
 - `src/internal/handler/__testkit__/repos/crud.int.testkit.ts`
 
 `testkit` uses these suffixes automatically:
@@ -599,7 +598,9 @@ Example layouts:
 - `*.scenario.testkit.ts`
 - `*.dal.testkit.ts`
 - `*.load.testkit.ts`
-- `*.pw.testkit.ts`
+- `*.ui.testkit.ts`
+
+See [docs/test-types.md](docs/test-types.md) for the canonical type model.
 
 Ownership is inferred from:
 
@@ -645,9 +646,8 @@ identifier plus canonical metadata such as:
 - `path`
 - `service`
 - `suiteName`
-- `selectionType`
+- `type`
 - `internalType`
-- `framework`
 - `skipped`
 - `skipReason`
 - `locks`

package/lib/app/doctor.mjs

@@ -31,12 +31,12 @@ export async function runDoctor(options = {}) {
 
   const playwrightViolations = findPlaywrightRuntimeImportViolations(productDir);
   checks.push({
-    code: "playwright-runtime-imports",
+    code: "ui-runtime-imports",
     level: playwrightViolations.length === 0 ? "pass" : "fail",
     message:
       playwrightViolations.length === 0
-        ? "No runtime @playwright/test imports found in testkit Playwright suites"
-        : `Found ${playwrightViolations.length} Playwright runtime import violation(s)`,
+        ? "No runtime @playwright/test imports found in testkit UI suites"
+        : `Found ${playwrightViolations.length} UI runtime import violation(s); import from @elench/testkit/ui instead`,
     details: playwrightViolations,
   });
 
@@ -51,7 +51,7 @@ export async function runDoctor(options = {}) {
     details: configImportViolations,
   });
 
-  const hasBrowserOrNextWork = discovery.files.some((entry) => entry.selectionType === "pw");
+  const hasBrowserOrNextWork = discovery.files.some((entry) => entry.type === "ui");
   if (hasBrowserOrNextWork) {
     const nodeCount = discovery.coverageGraph?.nodes?.length || 0;
     checks.push({
@@ -159,7 +159,7 @@ function collectFiles(rootDir, out = []) {
       collectFiles(absolutePath, out);
       continue;
     }
-    if (entry.isFile() && entry.name.endsWith(".pw.testkit.ts")) {
+    if (entry.isFile() && (entry.name.endsWith(".ui.testkit.ts") || entry.name.endsWith(".ui.testkit.ts"))) {
       out.push(absolutePath);
     }
   }

package/lib/app/typecheck.mjs

@@ -83,7 +83,7 @@ function writeRootTypecheckConfig({ productDir, configFile, outputDir }) {
       "**/*.load.testkit.ts",
       "**/__testkit__/helpers/**/*.ts",
     ],
-    exclude: ["node_modules", "dist", ".testkit", "**/*.pw.testkit.ts"],
+    exclude: ["node_modules", "dist", ".testkit", "**/*.ui.testkit.ts", "**/*.ui.testkit.ts"],
   };
   fs.writeFileSync(tsconfigPath, `${JSON.stringify(config, null, 2)}\n`);
   return tsconfigPath;
@@ -104,14 +104,15 @@ function writeNextServiceTypecheckConfig({ productDir, cwd, outputDir, serviceNa
     }),
     include: [
       serviceExists(serviceDir, "next-env.d.ts") ? relativeJsonPath(tsconfigPath, path.join(serviceDir, "next-env.d.ts")) : undefined,
-      relativeGlob(tsconfigPath, serviceDir, "src/**/*.pw.testkit.ts"),
+      relativeGlob(tsconfigPath, serviceDir, "src/**/*.ui.testkit.ts"),
+      relativeGlob(tsconfigPath, serviceDir, "src/**/*.ui.testkit.ts"),
       relativeGlob(tsconfigPath, serviceDir, "tests/playwright-fixtures/**/*.ts"),
       relativeGlob(tsconfigPath, serviceDir, "tests/playwright-fixtures/**/*.tsx"),
       relativeGlob(tsconfigPath, serviceDir, "tests/playwright-fixtures/**/*.mts"),
       relativeGlob(tsconfigPath, serviceDir, ".next/types/**/*.ts"),
       relativeGlob(tsconfigPath, serviceDir, ".next/dev/types/**/*.ts"),
-      relativeGlob(tsconfigPath, serviceDir, ".next-testkit/**/dist/types/**/*.ts"),
-      relativeGlob(tsconfigPath, serviceDir, ".next-testkit/**/dist/dev/types/**/*.ts"),
+      relativeGlob(tsconfigPath, productDir, ".next-testkit/**/dist/types/**/*.ts"),
+      relativeGlob(tsconfigPath, productDir, ".next-testkit/**/dist/dev/types/**/*.ts"),
     ].filter(Boolean),
     exclude: ["node_modules", ".next/cache", ".next/dev"],
   };
@@ -195,7 +196,7 @@ function packageTypePaths(tsconfigPath) {
     "@elench/testkit/config": [relativeJsonPath(tsconfigPath, path.join(PACKAGE_ROOT, "lib", "config-api", "index.d.ts"))],
     "@elench/testkit/drizzle": [relativeJsonPath(tsconfigPath, path.join(PACKAGE_ROOT, "lib", "drizzle", "index.d.ts"))],
     "@elench/testkit/env": [relativeJsonPath(tsconfigPath, path.join(PACKAGE_ROOT, "lib", "env", "index.d.ts"))],
-    "@elench/testkit/playwright": [relativeJsonPath(tsconfigPath, path.join(PACKAGE_ROOT, "lib", "playwright", "index.d.ts"))],
+    "@elench/testkit/ui": [relativeJsonPath(tsconfigPath, path.join(PACKAGE_ROOT, "lib", "ui", "index.d.ts"))],
     "@elench/testkit/runtime": [relativeJsonPath(tsconfigPath, path.join(PACKAGE_ROOT, "lib", "runtime", "index.d.ts"))],
     "@elench/testkit/vitest": [relativeJsonPath(tsconfigPath, path.join(PACKAGE_ROOT, "lib", "vitest", "index.d.ts"))],
   };

package/lib/bundler/index.mjs

@@ -10,6 +10,7 @@ const PACKAGE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)),
 const ROOT_ENTRY = path.join(PACKAGE_ROOT, "lib", "index.mjs");
 const CONFIG_ENTRY = path.join(PACKAGE_ROOT, "lib", "config-api", "index.mjs");
 const RUNTIME_ENTRY = path.join(PACKAGE_ROOT, "lib", "runtime", "index.mjs");
+const MANIFEST_FILE = "manifest.json";
 const bundleCache = new Map();
 
 export async function bundleK6File({
@@ -22,9 +23,18 @@ export async function bundleK6File({
   fs.mkdirSync(bundleDir, { recursive: true });
 
   const configFile = findConfigFile(productDir);
-  const cacheKey = await buildCacheKey(absoluteSource, configFile);
+  const metadata = await buildCacheMetadata(absoluteSource, configFile);
+  const { cacheKey } = metadata;
   const cached = bundleCache.get(cacheKey);
   if (cached && fs.existsSync(cached)) {
+    updateBundleManifest(bundleDir, {
+      ...metadata,
+      serviceName: serviceName || "shared",
+      sourceFile: absoluteSource,
+      outputFile: cached,
+      entryFile: inferEntryFile(cached),
+      hasSourcemap: fileHasInlineSourcemap(cached),
+    });
     return cached;
   }
 
@@ -36,6 +46,20 @@ export async function bundleK6File({
     bundleDir,
     `${path.basename(sourceFile, path.extname(sourceFile))}-${cacheKey.slice(0, 12)}.entry.mjs`
   );
+
+  if (fs.existsSync(outputFile) && fs.existsSync(entryFile)) {
+    bundleCache.set(cacheKey, outputFile);
+    updateBundleManifest(bundleDir, {
+      ...metadata,
+      serviceName: serviceName || "shared",
+      sourceFile: absoluteSource,
+      outputFile,
+      entryFile,
+      hasSourcemap: fileHasInlineSourcemap(outputFile),
+    });
+    return outputFile;
+  }
+
   fs.writeFileSync(entryFile, buildBundleEntryModule({
     sourceFile: absoluteSource,
     configFile,
@@ -49,7 +73,7 @@ export async function bundleK6File({
     legalComments: "none",
     outfile: outputFile,
     platform: "neutral",
-    sourcemap: "inline",
+    sourcemap: bundleSourcemapEnabled() ? "inline" : false,
     target: "es2020",
     plugins: [testkitPackageAliasPlugin()],
     external: [
@@ -59,26 +83,44 @@ export async function bundleK6File({
   });
 
   bundleCache.set(cacheKey, outputFile);
+  updateBundleManifest(bundleDir, {
+    ...metadata,
+    serviceName: serviceName || "shared",
+    sourceFile: absoluteSource,
+    outputFile,
+    entryFile,
+    hasSourcemap: bundleSourcemapEnabled(),
+  });
   return outputFile;
 }
 
-async function buildCacheKey(sourceFile, configFile = null) {
+async function buildCacheMetadata(sourceFile, configFile = null) {
   const source = await fs.promises.readFile(sourceFile, "utf8");
-  const packageJson = await fs.promises.readFile(path.join(PACKAGE_ROOT, "package.json"), "utf8");
+  const packageJsonText = await fs.promises.readFile(path.join(PACKAGE_ROOT, "package.json"), "utf8");
+  const packageJson = JSON.parse(packageJsonText);
+  const sourceHash = crypto.createHash("sha256").update(source).digest("hex");
   const hash = crypto
     .createHash("sha256")
     .update(sourceFile)
     .update("\0")
     .update(source)
     .update("\0")
-    .update(packageJson);
+    .update(packageJsonText);
+  let configHash = null;
 
   if (configFile && fs.existsSync(configFile)) {
+    const configText = await fs.promises.readFile(configFile, "utf8");
+    configHash = crypto.createHash("sha256").update(configFile).update("\0").update(configText).digest("hex");
     hash.update("\0").update(configFile).update("\0");
-    hash.update(await fs.promises.readFile(configFile, "utf8"));
+    hash.update(configText);
   }
 
-  return hash.digest("hex");
+  return {
+    cacheKey: hash.digest("hex"),
+    sourceHash,
+    configHash,
+    testkitVersion: packageJson.version || null,
+  };
 }
 
 function testkitPackageAliasPlugin() {
@@ -153,3 +195,88 @@ function normalizeTestkitSuite(module) {
 }
 `;
 }
+
+function updateBundleManifest(bundleDir, entry) {
+  const manifestPath = path.join(bundleDir, MANIFEST_FILE);
+  const manifest = readBundleManifest(manifestPath);
+  const now = new Date().toISOString();
+  const existingIndex = manifest.entries.findIndex((candidate) => candidate.cacheKey === entry.cacheKey);
+  const existing = existingIndex >= 0 ? manifest.entries[existingIndex] : null;
+  const document = {
+    sourceFile: entry.sourceFile,
+    cacheKey: entry.cacheKey,
+    outputFile: entry.outputFile,
+    entryFile: entry.entryFile,
+    createdAt: existing?.createdAt || now,
+    lastUsedAt: now,
+    sizeBytes: safeSize(entry.outputFile) + safeSize(entry.entryFile),
+    testkitVersion: entry.testkitVersion,
+    configHash: entry.configHash,
+    sourceHash: entry.sourceHash,
+    hasSourcemap: Boolean(entry.hasSourcemap),
+  };
+
+  if (existingIndex >= 0) {
+    manifest.entries[existingIndex] = document;
+  } else {
+    manifest.entries.push(document);
+  }
+  manifest.entries.sort((left, right) => String(left.sourceFile).localeCompare(String(right.sourceFile)) || String(left.cacheKey).localeCompare(String(right.cacheKey)));
+  writeBundleManifest(manifestPath, manifest);
+}
+
+function readBundleManifest(manifestPath) {
+  if (!fs.existsSync(manifestPath)) {
+    return {
+      schemaVersion: 1,
+      source: "testkit-bundle-cache",
+      entries: [],
+    };
+  }
+  try {
+    const parsed = JSON.parse(fs.readFileSync(manifestPath, "utf8"));
+    return {
+      schemaVersion: 1,
+      source: "testkit-bundle-cache",
+      ...parsed,
+      entries: Array.isArray(parsed.entries) ? parsed.entries : [],
+    };
+  } catch {
+    return {
+      schemaVersion: 1,
+      source: "testkit-bundle-cache",
+      entries: [],
+    };
+  }
+}
+
+function writeBundleManifest(manifestPath, manifest) {
+  const tempPath = `${manifestPath}.${process.pid}.${Date.now()}.tmp`;
+  fs.writeFileSync(tempPath, `${JSON.stringify(manifest, null, 2)}\n`, "utf8");
+  fs.renameSync(tempPath, manifestPath);
+}
+
+function bundleSourcemapEnabled() {
+  return process.env.TESTKIT_BUNDLE_SOURCEMAP === "1";
+}
+
+function inferEntryFile(outputFile) {
+  return outputFile.replace(/\.js$/, ".entry.mjs");
+}
+
+function safeSize(filePath) {
+  try {
+    return fs.statSync(filePath).size;
+  } catch {
+    return 0;
+  }
+}
+
+function fileHasInlineSourcemap(filePath) {
+  try {
+    const text = fs.readFileSync(filePath, "utf8");
+    return /sourceMappingURL=data:application\/json/.test(text);
+  } catch {
+    return false;
+  }
+}

package/lib/cli/args.mjs

@@ -1,11 +1,12 @@
 import path from "path";
 import { normalizeTypeValues, parseSuiteSelectors } from "../runner/suite-selection.mjs";
+import { publicTestTypeList, publicTestTypeListText } from "../domain/test-types.mjs";
 import {
   parseFileTimeoutOption,
   parseWorkersOption,
 } from "../runner/execution-config.mjs";
 
-export const POSITIONAL_TYPES = new Set(["int", "e2e", "scenario", "dal", "load", "pw", "all"]);
+export const POSITIONAL_TYPES = new Set(publicTestTypeList({ includeAll: true, includeLegacy: true }));
 export const LIFECYCLE = new Set(["status", "destroy", "cleanup"]);
 export const RESERVED = new Set([...POSITIONAL_TYPES, ...LIFECYCLE]);
 
@@ -33,7 +34,7 @@ export function resolveCliSelection({ first, second, third }) {
   } else if (first) {
     throw new Error(
       `Unknown argument "${first}". Expected a lifecycle command (status, destroy, cleanup) ` +
-      `or suite type (int, e2e, scenario, dal, load, pw, all).`
+      `or suite type (${publicTestTypeListText({ includeAll: true })}).`
     );
   }
 

package/lib/cli/assistant/command-observer.mjs

@@ -1,9 +1,10 @@
 import fs from "fs";
 import path from "path";
+import { publicTestTypeList } from "../../domain/test-types.mjs";
 
 const POLL_INTERVAL_MS = 150;
 const OBSERVED_KINDS = new Set(["run", "discover", "status", "doctor", "typecheck"]);
-const RUN_KINDS = new Set(["run", "int", "e2e", "scenario", "dal", "load", "pw", "all"]);
+const RUN_KINDS = new Set(["run", ...publicTestTypeList({ includeAll: true, includeLegacy: true })]);
 
 export function createAssistantCommandObserver({
   productDir,

package/lib/cli/assistant/command-results.mjs

@@ -1,5 +1,6 @@
 import fs from "fs";
 import path from "path";
+import { publicTestTypeList } from "../../domain/test-types.mjs";
 
 export const ASSISTANT_SESSION_ENV = "TESTKIT_ASSISTANT_SESSION_ID";
 export const ASSISTANT_RESULT_DIR_ENV = "TESTKIT_ASSISTANT_RESULT_DIR";
@@ -7,7 +8,7 @@ export const ASSISTANT_COMMAND_LOG_ENV = "TESTKIT_ASSISTANT_COMMAND_LOG";
 export const ASSISTANT_COMMAND_ID_ENV = "TESTKIT_ASSISTANT_COMMAND_ID";
 export const ASSISTANT_WRAPPER_LOGGED_ENV = "TESTKIT_ASSISTANT_WRAPPER_LOGGED";
 
-const RUN_SHORTCUTS = new Set(["int", "e2e", "scenario", "dal", "load", "pw", "all"]);
+const RUN_SHORTCUTS = new Set(publicTestTypeList({ includeAll: true, includeLegacy: true }));
 const FLAGS_WITH_VALUES = new Set([
   "--dir",
   "--service",

package/lib/cli/assistant/context-pack.mjs

@@ -178,7 +178,7 @@ function appendCommandLog(event) {
 }
 
 function inferKind(args) {
-  const runShortcuts = new Set(["int", "e2e", "scenario", "dal", "load", "pw", "all"]);
+  const runShortcuts = new Set(["ui", "e2e", "scenario", "int", "dal", "load", "all"]);
   const flagsWithValues = new Set([
     "--dir",
     "--service",
@@ -248,7 +248,7 @@ function buildContextMarkdown(productDir, snapshot, paths) {
     "## Guidance",
     "- Work normally in the repository and run real commands. Testkit observes recognized Testkit commands and renders them in the assistant UI.",
     "- Prefer `testkit ...` commands when using Testkit directly; `npx testkit ...` and project scripts are also valid.",
-    "- `testkit run e2e` selects e2e suites. `testkit run pw` selects Playwright/browser suites.",
+    "- `testkit run ui` selects UI suites. `testkit run e2e` selects e2e suites.",
     "- Do not reinterpret CLI syntax after an execution failure unless `testkit run --help` confirms a syntax problem.",
     "- Use the command log and focused context files before rereading artifacts manually.",
     "- Prefer repo-local commands over guessing project-specific wrappers.",

package/lib/cli/assistant/prompt-builder.mjs

@@ -15,8 +15,8 @@ export function buildAssistantPrompt({
     "You are Testkit Assistant.",
     "You are running as a coding agent inside the user's repository.",
     "Work normally: inspect files, edit files, run real shell commands, and iterate until the user's request is handled.",
-    "When using Testkit, run real commands such as `testkit discover`, `testkit run e2e`, `testkit run pw`, `npx testkit run int`, or the repository's package scripts.",
-    "`testkit run e2e` selects e2e suites. `testkit run pw` selects Playwright/browser suites. Choose commands from the user's request and the command reference, not from Testkit prompt routing.",
+    "When using Testkit, run real commands such as `testkit discover`, `testkit run ui`, `testkit run e2e`, `npx testkit run int`, or the repository's package scripts.",
+    "`testkit run ui` selects UI suites. `testkit run e2e` selects e2e suites. Choose commands from the user's request and the command reference, not from Testkit prompt routing.",
     "Testkit observes recognized Testkit commands and renders rich assistant UI from the real command output, sidecars, and artifacts.",
     "Do not respond with a JSON tool envelope. Give the user a normal final answer when you are done.",
     "",

package/lib/cli/command-flags.mjs

@@ -1,4 +1,5 @@
 import { Flags } from "@oclif/core";
+import { publicTestTypeListText } from "../domain/test-types.mjs";
 
 export const sharedFlags = {
   dir: Flags.string({
@@ -14,7 +15,7 @@ export const runFlags = {
   type: Flags.string({
     char: "t",
     multiple: true,
-    description: "Run specific suite type(s): int, e2e, scenario, dal, load, pw, all",
+    description: `Run specific suite type(s): ${publicTestTypeListText({ includeAll: true })}`,
   }),
   suite: Flags.string({
     char: "s",

package/lib/cli/commands/cleanup.mjs

@@ -1,4 +1,4 @@
-import { Command } from "@oclif/core";
+import { Command, Flags } from "@oclif/core";
 import { sharedFlags } from "../command-flags.mjs";
 import { executeCleanupOperation } from "../operations/cleanup/operation.mjs";
 import { renderCleanupResult } from "../renderers/cleanup/text.mjs";
@@ -8,7 +8,18 @@ export default class CleanupCommand extends Command {
 
   static enableJsonFlag = true;
 
-  static flags = sharedFlags;
+  static flags = {
+    ...sharedFlags,
+    "dry-run": Flags.boolean({
+      description: "Show cleanup actions without deleting state",
+      default: false,
+    }),
+    cache: Flags.string({
+      description: "Clean cache state: runtime, bundles, assistant, or all",
+      multiple: true,
+      options: ["runtime", "bundles", "assistant", "all"],
+    }),
+  };
 
   async run() {
     const { flags } = await this.parse(CleanupCommand);

package/lib/cli/commands/discover.mjs

@@ -3,6 +3,7 @@ import { executeDiscoverOperation } from "../operations/discover/operation.mjs";
 import { renderDiscoverResult } from "../renderers/discover/text.mjs";
 import { sharedFlags } from "../command-flags.mjs";
 import { withAssistantCommandResult } from "../assistant/command-results.mjs";
+import { publicTestTypeListText } from "../../domain/test-types.mjs";
 
 export default class DiscoverCommand extends Command {
   static summary = "Discover managed tests and report their metadata";
@@ -14,7 +15,7 @@ export default class DiscoverCommand extends Command {
     type: Flags.string({
       char: "t",
       multiple: true,
-      description: "Filter by suite type(s): int, e2e, scenario, dal, load, pw, all",
+      description: `Filter by suite type(s): ${publicTestTypeListText({ includeAll: true })}`,
     }),
     suite: Flags.string({
       char: "s",

package/lib/cli/commands/run.mjs

@@ -3,6 +3,7 @@ import { runFlags } from "../command-flags.mjs";
 import { buildRunRequest, executeRunRequest } from "../operations/run/operation.mjs";
 import { resolveTerminalCapabilities } from "../terminal/capabilities.mjs";
 import { withAssistantCommandResult } from "../assistant/command-results.mjs";
+import { publicTestTypeList, publicTestTypeListText } from "../../domain/test-types.mjs";
 
 export default class RunCommand extends Command {
   static summary = "Run test suites";
@@ -11,9 +12,9 @@ export default class RunCommand extends Command {
 
   static args = {
     type: Args.string({
-      description: "Optional suite type shortcut: int, e2e, scenario, dal, load, pw, all",
+      description: `Optional suite type shortcut: ${publicTestTypeListText({ includeAll: true })}`,
       required: false,
-      options: ["int", "e2e", "scenario", "dal", "load", "pw", "all"],
+      options: publicTestTypeList({ includeAll: true, includeLegacy: true }),
     }),
   };
 

package/lib/cli/entrypoint.mjs

@@ -1,3 +1,5 @@
+import { publicTestTypeList } from "../domain/test-types.mjs";
+
 export function normalizeCliArgs(argv) {
   if (argv[0] === "help") return normalizeHelpInvocation(argv);
   if (isOclifBuiltinInvocation(argv)) return argv;
@@ -14,7 +16,7 @@ export function normalizeCliArgs(argv) {
     "browser",
     "db",
   ]);
-  const runTypeShortcuts = new Set(["int", "e2e", "scenario", "dal", "load", "pw", "all"]);
+  const runTypeShortcuts = new Set(publicTestTypeList({ includeAll: true, includeLegacy: true }));
   const valueFlags = new Set([
     "--dir",
     "--service",

package/lib/cli/operations/cleanup/operation.mjs

@@ -4,5 +4,10 @@ import { loadManagedConfigs } from "../../../app/configs.mjs";
 export async function executeCleanupOperation(flags = {}) {
   const { allConfigs } = await loadManagedConfigs({ dir: flags.dir, service: flags.service });
   const productDir = allConfigs[0]?.productDir || process.cwd();
-  return runner.cleanup(productDir);
+  return runner.cleanup(productDir, {
+    allConfigs,
+    serviceName: flags.service || null,
+    dryRun: flags["dry-run"],
+    cache: flags.cache || [],
+  });
 }

package/lib/cli/operations/status/operation.mjs

@@ -2,6 +2,6 @@ import * as runner from "../../../runner/index.mjs";
 import { loadManagedConfigs } from "../../../app/configs.mjs";
 
 export async function executeStatusOperation(flags = {}) {
-  const { configs } = await loadManagedConfigs({ dir: flags.dir, service: flags.service });
-  return configs.map((config) => runner.showStatus(config));
+  const { allConfigs, configs } = await loadManagedConfigs({ dir: flags.dir, service: flags.service });
+  return configs.map((config) => runner.showStatus(config, { allConfigs }));
 }

package/lib/cli/renderers/discover/report.mjs

@@ -10,7 +10,7 @@ import {
   statusLabel,
 } from "../../terminal/colors.mjs";
 
-const TYPE_ORDER = ["int", "e2e", "scenario", "dal", "load", "pw"];
+const TYPE_ORDER = ["ui", "e2e", "scenario", "int", "dal", "load"];
 
 const TREE_BRANCH = "\u251C\u2500\u2500 ";
 const TREE_LAST = "\u2514\u2500\u2500 ";
@@ -98,13 +98,11 @@ function buildVerboseLines(result) {
 
     const suites = result.suites.filter((suite) => suite.service === service.name).sort(compareSuites);
     for (const suite of suites) {
-      lines.push(
-        `  suite ${suite.selectionType}:${suite.name} ${muted(`[${suite.framework}]`)} ${muted(`${suite.fileCount} files`)}`
-      );
+      lines.push(`  suite ${suite.type}:${suite.name} ${muted(`${suite.fileCount} files`)}`);
       if (suite.locks.length > 0) {
         lines.push(`    locks ${suite.locks.join(", ")}`);
       }
-      for (const file of result.files.filter((entry) => entry.service === service.name && entry.suiteName === suite.name && entry.selectionType === suite.selectionType)) {
+      for (const file of result.files.filter((entry) => entry.service === service.name && entry.suiteName === suite.name && entry.type === suite.type)) {
         lines.push(`    ${file.displayName}`);
         lines.push(`      path ${file.path}`);
         lines.push(`      id ${file.id}`);
@@ -142,9 +140,9 @@ function groupSuitesByServiceAndType(suites) {
       byType = new Map();
       grouped.set(suite.service, byType);
     }
-    const list = byType.get(suite.selectionType) || [];
+    const list = byType.get(suite.type) || [];
     list.push(suite);
-    byType.set(suite.selectionType, list.sort(compareSuites));
+    byType.set(suite.type, list.sort(compareSuites));
   }
   return grouped;
 }
@@ -152,7 +150,7 @@ function groupSuitesByServiceAndType(suites) {
 function groupFilesBySuite(files) {
   const bySuite = new Map();
   for (const file of files) {
-    const suiteId = [file.service, file.selectionType, file.framework, file.suiteName].join("|");
+    const suiteId = [file.service, file.type, file.suiteName].join("|");
     const list = bySuite.get(suiteId) || [];
     list.push(file);
     bySuite.set(

package/lib/cli/renderers/run/failure.mjs

@@ -25,7 +25,7 @@ export function renderFailureBlock(task, outcome, { width, regressionCatalog } =
 }
 
 function normalizeRegressionType(task) {
-  if (task.framework === "playwright") return "pw";
+  if (task.framework === "playwright" || task.type === "ui") return "ui";
   if (task.type === "integration") return "int";
   return task.type;
 }

package/lib/cli/renderers/run/text-reporter.mjs

@@ -157,7 +157,7 @@ export function createRunReporter({ outputMode = "compact", stdout = process.std
 }
 
 function displayTaskType(task) {
-  if (task.framework === "playwright") return "pw";
+  if (task.framework === "playwright" || task.type === "ui") return "ui";
   if (task.type === "integration") return "int";
   return task.type;
 }