@elench/testkit 0.1.97 → 0.1.99

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

@@ -0,0 +1,129 @@
+import * as runner from "../../../runner/index.mjs";
+import { loadManagedConfigs } from "../../../app/configs.mjs";
+import {
+  parseFileTimeoutOption,
+  parseShardOption,
+  parseSuiteOption,
+  parseTypeOption,
+  parseWorkersOption,
+  resolveRequestedFiles,
+} from "../../args.mjs";
+import { createRunReporter } from "../../renderers/run/text-reporter.mjs";
+import { createRunEventsReporter } from "../../renderers/run/events.mjs";
+import { createRunSession, renderRunSessionView } from "../../renderers/run/interactive.mjs";
+import { loadCliConfig } from "../../config.mjs";
+import {
+  resolveRunOutputMode,
+  resolveTerminalCapabilities,
+  selectRunRenderer,
+} from "../../terminal/capabilities.mjs";
+
+export async function buildRunRequest(flags, positionalType = null, cwd = process.cwd(), invocationCwd = process.cwd()) {
+  const { allConfigs, configs } = await loadManagedConfigs({ dir: flags.dir, service: flags.service });
+  const workers = flags.workers == null ? null : parseWorkersOption(flags.workers);
+  const fileTimeoutSeconds =
+    flags["file-timeout-seconds"] == null
+      ? null
+      : parseFileTimeoutOption(flags["file-timeout-seconds"]);
+  const shard = parseShardOption(flags.shard);
+  const typeValues = parseTypeOption(flags.type, positionalType);
+  const suiteSelectors = parseSuiteOption(flags.suite);
+  const rawFileNames = Array.isArray(flags.file) ? flags.file : [flags.file].filter(Boolean);
+  const productDir = allConfigs[0]?.productDir || cwd;
+  const fileNames = resolveRequestedFiles(rawFileNames, productDir, invocationCwd);
+
+  return {
+    allConfigs,
+    configs,
+    productDir,
+    typeValues,
+    suiteSelectors,
+    runOptions: {
+      ...flags,
+      typeValues,
+      fileNames,
+      workers,
+      fileTimeoutSeconds,
+      shard,
+      scenarioSeed: flags.seed || null,
+      serviceFilter: flags.service || null,
+      writeStatus: flags["write-status"],
+      allowPartialStatus: flags["allow-partial-status"],
+      ignoreSkipRules: flags["ignore-skip-rules"],
+    },
+  };
+}
+
+export async function executeRunRequest(
+  request,
+  {
+    outputMode: requestedMode = "compact",
+    json = false,
+    debug = false,
+    terminal = {},
+    attachedRunSession = null,
+  } = {}
+) {
+  const capabilities = resolveTerminalCapabilities(terminal);
+  const outputMode = resolveRunOutputMode({
+    requestedMode,
+    json,
+    debug,
+  });
+  const renderer = selectRunRenderer(outputMode, capabilities);
+  const config = loadCliConfig(request.productDir);
+  let reporter;
+  let mountedView = null;
+  let runSession = attachedRunSession;
+
+  if (attachedRunSession) {
+    runSession = attachedRunSession;
+    reporter = runSession.reporter;
+  } else if (renderer === "tree") {
+    runSession = attachedRunSession || createRunSession({
+      productDir: request.productDir,
+      stderr: capabilities.stderr,
+      config,
+    });
+    reporter = runSession.reporter;
+    mountedView = renderRunSessionView(runSession, {
+      stdout: capabilities.stdout,
+      stderr: capabilities.stderr,
+      interactive: true,
+    });
+  } else if (renderer === "events") {
+    reporter = createRunEventsReporter({
+      stdout: capabilities.stdout,
+      stderr: capabilities.stderr,
+    });
+  } else {
+    reporter = createRunReporter({
+      outputMode,
+      stdout: capabilities.stdout,
+      stderr: capabilities.stderr,
+    });
+  }
+
+  try {
+    const result = await runner.runAll(
+      request.configs,
+      request.typeValues,
+      request.suiteSelectors,
+      {
+        reporter,
+        ...request.runOptions,
+      },
+      request.allConfigs
+    );
+    await mountedView?.finalize;
+    return {
+      outputMode,
+      runSession,
+      ...result,
+    };
+  } catch (error) {
+    mountedView?.close?.();
+    await mountedView?.finalize?.catch?.(() => {});
+    throw error;
+  }
+}

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

@@ -0,0 +1,7 @@
+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));
+}

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

@@ -0,0 +1,5 @@
+import { runTestkitTypecheck } from "../../../app/typecheck.mjs";
+
+export async function executeTypecheckOperation(flags = {}) {
+  return runTestkitTypecheck({ dir: flags.dir });
+}

package/lib/cli/renderers/browser-serve/text.mjs

@@ -0,0 +1,6 @@
+export function renderBrowserServeResult(result) {
+  return [
+    `testkit browser bridge serving ${result.productDir}`,
+    `Listening on ${result.url}`,
+  ];
+}

package/lib/cli/renderers/cleanup/text.mjs

@@ -0,0 +1,3 @@
+export function renderCleanupResult(result) {
+  return Array.isArray(result?.lines) ? result.lines : [];
+}

package/lib/cli/renderers/db-snapshot-capture/text.mjs

@@ -0,0 +1,3 @@
+export function renderDatabaseSnapshotCaptureResult(result) {
+  return [`Wrote ${result.outputLabel}`];
+}

package/lib/cli/renderers/destroy/text.mjs

@@ -0,0 +1,3 @@
+export function renderDestroyResult(results) {
+  return (results || []).map((result) => `Destroyed ${result.name}`);
+}

package/lib/cli/{presentation/discovery-reporter.mjs → renderers/discover/report.mjs}

@@ -1,5 +1,5 @@
-import { formatDuration } from "../../runner/formatting.mjs";
-import { formatSelectionTypeLabel } from "../../discovery/index.mjs";
+import { formatDuration } from "../../../runner/formatting.mjs";
+import { formatSelectionTypeLabel } from "../../../discovery/index.mjs";
 import {
   bold,
   colorDiagnosticSeverity,
@@ -8,7 +8,7 @@ import {
   colorTypeBadge,
   muted,
   statusLabel,
-} from "./colors.mjs";
+} from "../../terminal/colors.mjs";
 
 const TYPE_ORDER = ["int", "e2e", "scenario", "dal", "load", "pw"];
 

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

@@ -0,0 +1,7 @@
+import { buildDiscoveryReportLines } from "./report.mjs";
+
+export function renderDiscoverResult(result, options = {}) {
+  const lines = buildDiscoveryReportLines(result, { outputMode: options.outputMode || "compact" });
+  if (result.outputLabel) lines.push(`Wrote ${result.outputLabel}`);
+  return lines;
+}

package/lib/cli/renderers/doctor/text.mjs

@@ -0,0 +1,7 @@
+export function renderDoctorResult(result) {
+  const lines = [`testkit doctor ${result.ok ? "passed" : "failed"} for ${result.productDir}`];
+  for (const check of result.checks || []) {
+    lines.push(`${check.level.toUpperCase()} ${check.code} ${check.message}`);
+  }
+  return lines;
+}

package/lib/cli/{presentation/failure-presentation.mjs → renderers/run/failure.mjs}

@@ -1,8 +1,8 @@
-import { buildFailurePresentation } from "../../runner/formatting.mjs";
-import { renderIndentedBlock } from "./terminal-layout.mjs";
+import { buildFailurePresentation } from "../../../runner/formatting.mjs";
+import { renderIndentedBlock } from "../../terminal/layout.mjs";
 
 export function renderFailureBlock(task, outcome, { width, regressionCatalog } = {}) {
-  const presentation = buildFailurePresentation(
+  const failureView = buildFailurePresentation(
     {
       service: task.serviceName,
       type: normalizeRegressionType(task),
@@ -15,10 +15,10 @@ export function renderFailureBlock(task, outcome, { width, regressionCatalog } =
   );
 
   const lines = [];
-  if (presentation.primary) {
-    lines.push(...renderIndentedBlock(presentation.primary, { width, indent: "    " }));
+  if (failureView.primary) {
+    lines.push(...renderIndentedBlock(failureView.primary, { width, indent: "    " }));
   }
-  for (const detail of presentation.details) {
+  for (const detail of failureView.details) {
     lines.push(...renderIndentedBlock(detail, { width, indent: "    " }));
   }
   return lines;

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

@@ -0,0 +1,119 @@
+import React, { createElement } from "react";
+import { render } from "ink";
+import { createRunState } from "../../state/run/state.mjs";
+import { RunTreeView } from "../../components/blocks/run-tree.mjs";
+import { suiteSelectionType } from "../../../runner/suite-selection.mjs";
+
+export function createRunSession({
+  productDir,
+  dataSource = "live",
+  stderr = process.stderr,
+  onSnapshot,
+  config = {},
+} = {}) {
+  const runState = createRunState({
+    dataSource,
+    autoCollapsePassedTreeBranches: config.autoCollapsePassedTreeBranches,
+  });
+  if (typeof onSnapshot === "function") {
+    runState.subscribe(() => {
+      onSnapshot(runState.getSnapshot());
+    });
+  }
+
+  const reporter = {
+    outputMode: "compact",
+
+    setServicePlans(plans) {
+      runState.initFromPlans(plans);
+    },
+
+    setTotalFileCount(count) {
+      runState.setTotalFileCount(count);
+    },
+
+    setRegressionCatalog(document) {
+      runState.setRegressionCatalog(document);
+    },
+
+    serviceSkipped(config, reason) {
+      runState.markServiceSkipped(config.name, reason);
+    },
+
+    plannedSkip(entry) {
+      runState.markPlannedSkip(entry);
+    },
+
+    taskStarted(task) {
+      const suiteKey = `${task.displayType || suiteSelectionType(task.type, task.framework)}:${task.suiteName}`;
+      runState.markFileRunning(task.serviceName, suiteKey, task.file);
+    },
+
+    taskFinished(task, outcome) {
+      runState.markFileFinished(task, outcome);
+    },
+
+    runtimeError(task, message) {
+      runState.markRuntimeError(task, message);
+    },
+
+    setupOperationFinished() {},
+
+    phaseStarted(label) {
+      runState.setPhase(label);
+    },
+
+    toolchainResolved() {},
+    localServiceStarting() {},
+    writeLine() {},
+    writeDebugLine() {},
+    telemetry() {},
+
+    runSummary(results, durationMs, regressionReport) {
+      runState.finish(results, durationMs, regressionReport);
+    },
+
+    error(message) {
+      stderr.write(`${message}\n`);
+    },
+  };
+
+  return {
+    productDir,
+    runState,
+    reporter,
+    getSnapshot() {
+      return runState.getSnapshot();
+    },
+  };
+}
+
+export function renderRunSessionView(
+  session,
+  {
+    stdout = process.stdout,
+    stderr = process.stderr,
+    interactive = true,
+    onRequestClose,
+  } = {}
+) {
+  const app = render(
+    createElement(RunTreeView, {
+      runState: session.runState,
+      stdout,
+      onRequestClose: close,
+      interactive,
+    }),
+    { stdout, stderr, exitOnCtrlC: false }
+  );
+
+  return {
+    finalize: app.waitUntilExit(),
+    close,
+  };
+
+  function close() {
+    app.unmount();
+    if (typeof onRequestClose === "function") onRequestClose();
+  }
+}

package/lib/cli/{presentation/run-reporter.mjs → renderers/run/text-reporter.mjs}

@@ -3,11 +3,11 @@ import {
   buildRunSummaryData,
   buildDebugRunSummaryLines,
   formatDuration,
-} from "../../runner/formatting.mjs";
-import { boldRed, colorSectionLine, dim, statusLabel } from "./colors.mjs";
-import { renderFailureBlock } from "./failure-presentation.mjs";
-import { renderSummaryBox } from "./summary-box.mjs";
-import { getTerminalWidth } from "./terminal-layout.mjs";
+} from "../../../runner/formatting.mjs";
+import { boldRed, colorSectionLine, dim, statusLabel } from "../../terminal/colors.mjs";
+import { renderFailureBlock } from "./failure.mjs";
+import { renderSummaryBox } from "../../components/primitives/summary-box.mjs";
+import { getTerminalWidth } from "../../terminal/layout.mjs";
 
 export function createRunReporter({ outputMode = "compact", stdout = process.stdout, stderr = process.stderr } = {}) {
   const mode = outputMode || "compact";

package/lib/cli/renderers/status/text.mjs

@@ -0,0 +1,7 @@
+export function renderStatusResult(result) {
+  return normalizeLines(result?.lines);
+}
+
+function normalizeLines(lines) {
+  return Array.isArray(lines) ? lines : [];
+}

package/lib/cli/renderers/typecheck/text.mjs

@@ -0,0 +1,7 @@
+export function renderTypecheckResult(result) {
+  const lines = [`Typechecked ${result.results.length} testkit program(s) in ${result.productDir}`];
+  for (const entry of result.results) {
+    lines.push(`PASS ${entry.label} ${entry.tsconfigPath}`);
+  }
+  return lines;
+}

package/lib/cli/{tui/inspect-model.mjs → state/run/model.mjs}

@@ -1,9 +1,7 @@
-import { fileDisplayName } from "../../discovery/index.mjs";
-import { suiteSelectionType } from "../../runner/suite-selection.mjs";
-import { formatDuration } from "../../runner/formatting.mjs";
-import { matchInspectEntry } from "./fuzzy-match.mjs";
-
-export const INSPECT_PANES = ["detail", "artifacts", "logs", "setup"];
+import { fileDisplayName } from "../../../discovery/index.mjs";
+import { suiteSelectionType } from "../../../runner/suite-selection.mjs";
+import { formatDuration } from "../../../runner/formatting.mjs";
+import { matchRunTreeEntry } from "../tree/fuzzy-match.mjs";
 
 export function buildSummaryRows({
   result,
@@ -41,9 +39,10 @@ export function buildSummaryRows({
   return rows;
 }
 
-export function createEmptyInspectModel(dataSource = "live") {
+export function createEmptyRunModel(dataSource = "live", options = {}) {
   return {
     dataSource,
+    autoCollapsePassedTreeBranches: options.autoCollapsePassedTreeBranches !== false,
     services: new Map(),
     summaryData: null,
     regressionCatalog: null,
@@ -57,11 +56,10 @@ export function createEmptyInspectModel(dataSource = "live") {
     filterMatches: new Map(),
     collapsedOverrides: new Map(),
     selectedEntryId: null,
-    paneMode: "detail",
   };
 }
 
-export function resetInspectModel(model, dataSource = model.dataSource) {
+export function resetRunModel(model, dataSource = model.dataSource) {
   model.dataSource = dataSource;
   model.services = new Map();
   model.summaryData = null;
@@ -76,7 +74,6 @@ export function resetInspectModel(model, dataSource = model.dataSource) {
   model.filterMatches = new Map();
   model.collapsedOverrides = new Map();
   model.selectedEntryId = null;
-  model.paneMode = "detail";
 }
 
 export function initModelFromPlans(model, servicePlans) {
@@ -124,7 +121,7 @@ export function initModelFromPlans(model, servicePlans) {
 }
 
 export function applyArtifactToModel(model, artifact) {
-  resetInspectModel(model, artifact?.run?.status === "running" ? "live" : "artifact");
+  resetRunModel(model, artifact?.run?.status === "running" ? "live" : "artifact");
   model.runArtifact = artifact;
   model.finished = artifact?.run?.status !== "running";
   model.phase = model.finished ? "run complete" : "live artifact";
@@ -287,24 +284,13 @@ export function updateFilter(model, query) {
   const normalizedQuery = model.filterQuery.trim();
   if (!normalizedQuery) return;
   for (const entry of collectAllEntries(model)) {
-    const match = matchInspectEntry(normalizedQuery, entry);
+    const match = matchRunTreeEntry(normalizedQuery, entry);
     if (match.matched) {
       model.filterMatches.set(entry.id, match);
     }
   }
 }
 
-export function cyclePane(model) {
-  const index = INSPECT_PANES.indexOf(model.paneMode);
-  model.paneMode = INSPECT_PANES[(index + 1) % INSPECT_PANES.length];
-}
-
-export function setPane(model, paneMode) {
-  if (INSPECT_PANES.includes(paneMode)) {
-    model.paneMode = paneMode;
-  }
-}
-
 export function toggleCollapsed(model, entryId) {
   const entry = getEntryById(model, entryId);
   if (!entry || (entry.kind !== "type" && entry.kind !== "suite")) return;
@@ -350,7 +336,6 @@ export function buildSnapshot(model) {
     finished: model.finished,
     summaryData: model.summaryData,
     regressionCatalog: model.regressionCatalog,
-    paneMode: model.paneMode,
     filter: {
       active: model.filterActive,
       query: model.filterQuery,
@@ -413,7 +398,7 @@ function buildNestedServices(model) {
       const suites = [...typeNode.suites.values()].map((suite) => {
         const files = [...suite.files.values()];
         const summary = summarizeFiles(files);
-        const autoCollapsed = summary.total > 0 && (summary.passed === summary.total || summary.skipped === summary.total);
+        const autoCollapsed = model.autoCollapsePassedTreeBranches && summary.total > 0 && (summary.passed === summary.total || summary.skipped === summary.total);
         return {
           id: suite.id,
           kind: "suite",
@@ -430,7 +415,7 @@ function buildNestedServices(model) {
         };
       });
       const summary = summarizeNestedEntries(suites.map((suite) => suite.summary));
-      const autoCollapsed = suites.length > 0 && suites.every((suite) => suite.collapsed);
+      const autoCollapsed = model.autoCollapsePassedTreeBranches && suites.length > 0 && suites.every((suite) => suite.collapsed);
       return {
         id: typeNode.id,
         kind: "type",

package/lib/cli/{tui/inspect-state.mjs → state/run/state.mjs}

@@ -1,8 +1,7 @@
 import {
   applyArtifactToModel,
   buildSnapshot,
-  createEmptyInspectModel,
-  cyclePane,
+  createEmptyRunModel,
   findEntryIdForFile,
   findEntryIdForService,
   finishModel,
@@ -12,18 +11,17 @@ import {
   markPlannedSkip,
   markRuntimeError,
   markServiceSkipped,
-  resetInspectModel,
+  resetRunModel,
   revealEntry,
-  setPane,
   setPhase,
   setRegressionCatalog,
   setTotalFileCount,
   toggleCollapsed,
   updateFilter,
-} from "./inspect-model.mjs";
+} from "./model.mjs";
 
-export function createInspectState({ dataSource = "live" } = {}) {
-  const model = createEmptyInspectModel(dataSource);
+export function createRunState({ dataSource = "live", autoCollapsePassedTreeBranches = true } = {}) {
+  const model = createEmptyRunModel(dataSource, { autoCollapsePassedTreeBranches });
   let notice = null;
   const listeners = new Set();
 
@@ -59,11 +57,16 @@ export function createInspectState({ dataSource = "live" } = {}) {
     },
 
     resetForLive() {
-      resetInspectModel(model, "live");
+      resetRunModel(model, "live");
       notice = null;
       notify();
     },
 
+    setAutoCollapsePassedTreeBranches(enabled) {
+      model.autoCollapsePassedTreeBranches = Boolean(enabled);
+      notify();
+    },
+
     setRegressionCatalog(document) {
       setRegressionCatalog(model, document);
       notify();
@@ -177,16 +180,6 @@ export function createInspectState({ dataSource = "live" } = {}) {
       return true;
     },
 
-    cyclePaneMode() {
-      cyclePane(model);
-      notify();
-    },
-
-    setPaneMode(paneMode) {
-      setPane(model, paneMode);
-      notify();
-    },
-
     subscribe(callback) {
       listeners.add(callback);
       return () => listeners.delete(callback);

package/lib/cli/{tui → state/tree}/fuzzy-match.mjs

@@ -44,7 +44,7 @@ export function fuzzyMatch(query, candidate) {
   return { matched: false, score: Number.NEGATIVE_INFINITY, positions: [] };
 }
 
-export function matchInspectEntry(query, entry) {
+export function matchRunTreeEntry(query, entry) {
   const fields = buildEntryMatchFields(entry);
   let best = null;
 

package/lib/cli/terminal/capabilities.mjs

@@ -0,0 +1,33 @@
+export function resolveTerminalCapabilities({
+  stdout = process.stdout,
+  stderr = process.stderr,
+  stdin = process.stdin,
+  env = process.env,
+  forceInteractive = false,
+} = {}) {
+  const interactiveOutput = Boolean(stdout?.isTTY || forceInteractive);
+  const interactiveInput = Boolean(stdin?.isTTY);
+  return {
+    stdout,
+    stderr,
+    stdin,
+    env,
+    forceInteractive,
+    interactiveOutput,
+    interactiveInput,
+    colorEnabled: Boolean(interactiveOutput || env?.FORCE_COLOR),
+    width: stdout?.columns || process.stdout?.columns || 100,
+  };
+}
+
+export function resolveRunOutputMode({ requestedMode = "compact", json = false, debug = false } = {}) {
+  if (json) return "json";
+  if (debug) return "debug";
+  return requestedMode || "compact";
+}
+
+export function selectRunRenderer(outputMode, capabilities) {
+  if (outputMode === "events") return "events";
+  if (outputMode === "compact" && capabilities?.interactiveOutput) return "tree";
+  return "text";
+}

package/lib/database/index.mjs

@@ -26,6 +26,7 @@ import {
   visitDirs as visitDirsModel,
 } from "./state.mjs";
 import { captureTemplateSnapshot, runTemplateStage } from "./template-steps.mjs";
+import { collectStateDirLines } from "../runner/state-io.mjs";
 
 const LOCAL_IMAGE = "pgvector/pgvector:pg16";
 const LOCAL_USER = "testkit";
@@ -154,22 +155,23 @@ export function isDatabaseStateDir(dir) {
   return fs.existsSync(path.join(dir, "database_backend"));
 }
 
-export function showServiceDatabaseStatus(productDir, serviceName) {
+export function collectServiceDatabaseStatus(productDir, serviceName) {
   const cacheDir = getLocalServiceCacheDir(productDir, serviceName);
   const infraDir = getLocalInfraDir(productDir);
-  if (!fs.existsSync(cacheDir) && !fs.existsSync(infraDir)) return false;
+  if (!fs.existsSync(cacheDir) && !fs.existsSync(infraDir)) return [];
 
+  const lines = [];
   if (fs.existsSync(cacheDir)) {
-    console.log("  database-cache/");
-    printStateDir(cacheDir, "    ");
+    lines.push("  database-cache/");
+    lines.push(...collectStateDirLines(cacheDir, "    "));
   }
 
   if (fs.existsSync(infraDir)) {
-    console.log("  database-infra/");
-    printStateDir(infraDir, "    ");
+    lines.push("  database-infra/");
+    lines.push(...collectStateDirLines(infraDir, "    "));
   }
 
-  return true;
+  return lines;
 }
 
 async function prepareLocalDatabase(config, options = {}) {
@@ -664,20 +666,6 @@ function visitDirs(root, visitor) {
   return visitDirsModel(root, visitor);
 }
 
-function printStateDir(dir, indent) {
-  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-    const filePath = path.join(dir, entry.name);
-    if (entry.isDirectory()) {
-      console.log(`${indent}${entry.name}/`);
-      printStateDir(filePath, `${indent}  `);
-      continue;
-    }
-    const value =
-      entry.name === "password" ? "********" : fs.readFileSync(filePath, "utf8").trim();
-    console.log(`${indent}${entry.name}: ${value}`);
-  }
-}
-
 async function withLock(lockPath, fn) {
   const lockDir = `${lockPath}.dir`;
   const timeoutMs = 60_000;

package/lib/{cli/viewer.mjs → results/artifacts.mjs}

@@ -6,7 +6,7 @@ import {
   findFailureLocation,
   formatLocation,
   renderCodeFrame,
-} from "./presentation/code-frames.mjs";
+} from "./code-frames.mjs";
 
 export function loadLatestRunArtifact(productDir) {
   const artifactPath = path.join(productDir, ".testkit", "results", "latest.json");