@elench/testkit 0.1.96 → 0.1.98

package/lib/runner/readiness.mjs

@@ -96,11 +96,11 @@ export async function isPortInUse({ host, port }) {
   });
 }
 
-export function printRunStatus(productDir) {
+export function buildRunStatusLines(productDir) {
   const manifests = listRunManifests(productDir);
-  if (manifests.length === 0) return;
+  if (manifests.length === 0) return [];
 
-  console.log("  runs/");
+  const lines = ["  runs/"];
   for (const manifest of manifests) {
     const state = isPidRunning(manifest.pid) ? "active" : "stale";
     const ports = [
@@ -110,8 +110,9 @@ export function printRunStatus(productDir) {
         )
       ),
     ];
-    console.log(
+    lines.push(
       `    ${manifest.runId}: ${state} pid=${manifest.pid}${ports.length > 0 ? ` ports=${ports.join(",")}` : ""}`
     );
   }
+  return lines;
 }

package/lib/runner/runtime-preparation.mjs

@@ -127,6 +127,7 @@ export async function computeRuntimePrepareFingerprint(config) {
         : null,
     })
   );
+  hash.update(JSON.stringify(collectRuntimeDatabaseFingerprintInputs(config)));
 
   for (const envFile of config.testkit.envFiles || []) {
     appendFileToHash(hash, config.productDir, resolveServiceCwd(config.productDir, envFile));
@@ -138,6 +139,41 @@ export async function computeRuntimePrepareFingerprint(config) {
   return hash.digest("hex");
 }
 
+function collectRuntimeDatabaseFingerprintInputs(config) {
+  const inputs = [];
+  const ownDatabaseUrl = readDatabaseUrl(config.stateDir);
+  if (ownDatabaseUrl) {
+    inputs.push({ service: config.name, url: ownDatabaseUrl });
+  }
+
+  const referencedServices = new Set();
+  for (const value of Object.values(config.testkit.serviceEnv || {})) {
+    collectDatabasePlaceholderServices(value, referencedServices, config.name);
+  }
+  for (const value of Object.values(config.testkit.local?.env || {})) {
+    collectDatabasePlaceholderServices(value, referencedServices, config.name);
+  }
+
+  const stateDirByService = config.testkit.templateContext?.stateDirByService;
+  for (const serviceName of [...referencedServices].sort()) {
+    const stateDir = stateDirByService?.get?.(serviceName);
+    const databaseUrl = stateDir ? readDatabaseUrl(stateDir) : null;
+    inputs.push({ service: serviceName, url: databaseUrl || null });
+  }
+
+  return inputs;
+}
+
+function collectDatabasePlaceholderServices(value, out, defaultServiceName) {
+  if (typeof value !== "string") return;
+  const matcher = /\{db(?:Url|Host|Port|Name|User|Password)(?::([a-zA-Z0-9_-]+))?\}/g;
+  let match = matcher.exec(value);
+  while (match) {
+    out.add(match[1] || defaultServiceName);
+    match = matcher.exec(value);
+  }
+}
+
 function appendResolvedInputToHash(hash, productDir, absPath) {
   const relative = path.relative(productDir, absPath);
   appendInputToHash(hash, productDir, relative);

package/lib/runner/state-io.mjs

@@ -33,16 +33,22 @@ export function readStateValue(filePath) {
   return fs.readFileSync(filePath, "utf8").trim();
 }
 
-export function printStateDir(dir, indent) {
+export function collectStateDirLines(dir, indent = "") {
+  const lines = [];
+  appendStateDirLines(lines, dir, indent);
+  return lines;
+}
+
+function appendStateDirLines(lines, 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}  `);
+      lines.push(`${indent}${entry.name}/`);
+      appendStateDirLines(lines, filePath, `${indent}  `);
       continue;
     }
     const value =
       entry.name === "password" ? "********" : fs.readFileSync(filePath, "utf8").trim();
-    console.log(`${indent}${entry.name}: ${value}`);
+    lines.push(`${indent}${entry.name}: ${value}`);
   }
 }

package/lib/runner/template.mjs

@@ -204,17 +204,29 @@ export function buildExecutionEnv(config, extraEnv = {}, processEnv = process.en
   return buildExecutionEnvWithContext(config, null, extraEnv, processEnv);
 }
 
+export function buildTemplateExecutionEnv(config, extraEnv = {}, processEnv = process.env) {
+  return buildExecutionEnvWithContext(config, null, extraEnv, processEnv, {
+    omitRuntimeDatabaseBindings: true,
+  });
+}
+
 export function buildTaskExecutionEnv(config, lease, extraEnv = {}, processEnv = process.env) {
   return buildExecutionEnvWithContext(config, lease, extraEnv, processEnv);
 }
 
-function buildExecutionEnvWithContext(config, lease, extraEnv, processEnv) {
+function buildExecutionEnvWithContext(config, lease, extraEnv, processEnv, options = {}) {
   const inheritedEnv = { ...processEnv };
   const templateContext = buildTemplateContext(config, lease);
+  const serviceEnv = options.omitRuntimeDatabaseBindings
+    ? omitRuntimeDatabaseBindings(config.testkit.serviceEnv || {})
+    : config.testkit.serviceEnv || {};
+  const localEnv = options.omitRuntimeDatabaseBindings
+    ? omitRuntimeDatabaseBindings(config.testkit.local?.env || {})
+    : config.testkit.local?.env || {};
   const env = {
     ...inheritedEnv,
-    ...resolveEnvTemplates(config.testkit.serviceEnv || {}, templateContext),
-    ...resolveEnvTemplates(config.testkit.local?.env || {}, templateContext),
+    ...resolveEnvTemplates(serviceEnv, templateContext),
+    ...resolveEnvTemplates(localEnv, templateContext),
     ...resolveEnvTemplates(extraEnv, templateContext),
     TESTKIT_ACTIVE: "1",
     ...(config.runtimeId ? { TESTKIT_RUNTIME_ID: String(config.runtimeId) } : {}),
@@ -340,6 +352,15 @@ function resolveEnvTemplates(values, templateContext) {
   );
 }
 
+function omitRuntimeDatabaseBindings(values = {}) {
+  return Object.fromEntries(
+    Object.entries(values).filter(([_key, value]) => {
+      if (typeof value !== "string") return true;
+      return !/\{db(?:Url|Host|Port|Name|User|Password)(?::[a-zA-Z0-9_-]+)?\}/.test(value);
+    })
+  );
+}
+
 function finalizeRuntimePrepare(prepare, context) {
   if (!prepare) {
     return {

package/node_modules/@elench/next-analysis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/next-analysis",
-  "version": "0.1.96",
+  "version": "0.1.98",
   "description": "SWC-backed Next.js source analysis primitives for Erench tools",
   "type": "module",
   "exports": {

package/node_modules/@elench/testkit-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit-bridge",
-  "version": "0.1.96",
+  "version": "0.1.98",
   "description": "Browser bridge helpers for testkit",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,7 +22,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@elench/testkit-protocol": "0.1.96"
+    "@elench/testkit-protocol": "0.1.98"
   },
   "private": false
 }

package/node_modules/@elench/testkit-protocol/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit-protocol",
-  "version": "0.1.96",
+  "version": "0.1.98",
   "description": "Shared browser protocol for testkit bridge and extension consumers",
   "type": "module",
   "main": "./dist/index.js",

package/node_modules/@elench/ts-analysis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/ts-analysis",
-  "version": "0.1.96",
+  "version": "0.1.98",
   "description": "TypeScript compiler-backed source analysis primitives for Erench tools",
   "type": "module",
   "exports": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit",
-  "version": "0.1.96",
+  "version": "0.1.98",
   "description": "Assistant-first CLI for running, inspecting, and debugging local testkit suites",
   "type": "module",
   "workspaces": [
@@ -83,10 +83,10 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.29.0",
-    "@elench/next-analysis": "0.1.96",
-    "@elench/testkit-bridge": "0.1.96",
-    "@elench/testkit-protocol": "0.1.96",
-    "@elench/ts-analysis": "0.1.96",
+    "@elench/next-analysis": "0.1.98",
+    "@elench/testkit-bridge": "0.1.98",
+    "@elench/testkit-protocol": "0.1.98",
+    "@elench/ts-analysis": "0.1.98",
     "@oclif/core": "^4.10.6",
     "esbuild": "^0.25.11",
     "execa": "^9.5.0",

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

@@ -1,227 +0,0 @@
-const TESTKIT_TYPES = new Set(["int", "e2e", "scenario", "dal", "load", "pw", "all"]);
-const TESTKIT_DIR_COMMANDS = new Set(["run", "discover", "status", "doctor", "destroy", "cleanup", "typecheck"]);
-const PACKAGE_RUNNERS = new Set(["npx", "pnpm", "npm", "yarn", "bun"]);
-
-export function extractShellCommand(args = {}) {
-  if (!args || typeof args !== "object") return "";
-  const value =
-    args.command ??
-    args.cmd ??
-    args.commandString ??
-    args.shellCommand ??
-    args.input ??
-    args.script ??
-    "";
-  if (Array.isArray(value)) return value.map((part) => shellEscapeArg(part)).join(" ");
-  return String(value || "");
-}
-
-export function planShellCommand(rawCommand) {
-  const raw = String(rawCommand || "").trim();
-  if (!raw) {
-    return {
-      executableCommand: "",
-      rawCommand: raw,
-      displayCommand: raw,
-      command: "",
-      title: "Shell command",
-      testkitRelated: false,
-      normalized: false,
-    };
-  }
-
-  const testkit = planTestkitCommand(raw);
-  if (testkit) return testkit;
-
-  const testkitScript = planTestkitPackageScript(raw);
-  if (testkitScript) return testkitScript;
-
-  return {
-    executableCommand: raw,
-    rawCommand: raw,
-    displayCommand: raw,
-    command: firstCommandToken(raw),
-    title: "Shell command",
-    testkitRelated: false,
-    normalized: false,
-  };
-}
-
-function planTestkitPackageScript(raw) {
-  if (containsShellControl(raw)) return null;
-  const tokens = tokenizeShellWords(raw);
-  if (!tokens || tokens.length < 3) return null;
-  if (tokens[0] !== "npm" || tokens[1] !== "run") return null;
-  if (tokens[2] !== "testkit" && !tokens[2].startsWith("testkit:")) return null;
-  return {
-    executableCommand: raw,
-    rawCommand: raw,
-    displayCommand: raw,
-    command: "npm run testkit",
-    title: "npm testkit script",
-    testkitRelated: true,
-    normalized: false,
-  };
-}
-
-function planTestkitCommand(raw) {
-  if (containsShellControl(raw)) return null;
-  const tokens = tokenizeShellWords(raw);
-  if (!tokens || tokens.length === 0) return null;
-
-  const extracted = extractTestkitInvocation(tokens);
-  if (!extracted) return null;
-
-  const canonicalArgs = canonicalizeTestkitArgs(extracted.args);
-  const executableCommand = ["testkit", ...canonicalArgs].map(shellEscapeArg).join(" ");
-  const wasNormalized = executableCommand !== raw;
-  return {
-    executableCommand,
-    rawCommand: raw,
-    displayCommand: executableCommand,
-    command: "testkit",
-    title: "testkit command",
-    testkitRelated: true,
-    normalized: wasNormalized,
-    normalizationReason: wasNormalized ? extracted.reason : null,
-  };
-}
-
-function extractTestkitInvocation(tokens) {
-  if (tokens[0] === "testkit") {
-    return {
-      args: tokens.slice(1),
-      reason: "canonicalized local testkit invocation",
-    };
-  }
-
-  if (!PACKAGE_RUNNERS.has(tokens[0])) return null;
-
-  if (tokens[0] === "npm" && ["exec", "x"].includes(tokens[1])) {
-    const index = findPackageTarget(tokens, 2);
-    if (index >= 0) return { args: tokens.slice(index + 1), reason: "replaced npm exec testkit with local testkit" };
-  }
-
-  if (tokens[0] === "npx") {
-    const index = findPackageTarget(tokens, 1);
-    if (index >= 0) return { args: tokens.slice(index + 1), reason: "replaced npx testkit with local testkit" };
-  }
-
-  if (tokens[0] === "pnpm" && ["exec", "dlx"].includes(tokens[1])) {
-    const index = findPackageTarget(tokens, 2);
-    if (index >= 0) return { args: tokens.slice(index + 1), reason: "replaced pnpm testkit launcher with local testkit" };
-  }
-
-  if (tokens[0] === "yarn" && tokens[1] === "testkit") {
-    return { args: tokens.slice(2), reason: "replaced yarn testkit launcher with local testkit" };
-  }
-
-  if (tokens[0] === "bun" && ["x", "run"].includes(tokens[1])) {
-    const index = findPackageTarget(tokens, 2);
-    if (index >= 0) return { args: tokens.slice(index + 1), reason: "replaced bun testkit launcher with local testkit" };
-  }
-
-  return null;
-}
-
-function canonicalizeTestkitArgs(inputArgs) {
-  const args = [...inputArgs];
-  if (args.length === 0) return [];
-
-  if (TESTKIT_TYPES.has(args[0])) {
-    return withDir(["run", "--type", args[0], ...args.slice(1)]);
-  }
-
-  if (!TESTKIT_DIR_COMMANDS.has(args[0])) {
-    return args;
-  }
-
-  if (args[0] === "run") {
-    const runArgs = [...args];
-    if (TESTKIT_TYPES.has(runArgs[1])) {
-      const type = runArgs.splice(1, 1)[0];
-      if (!hasFlag(runArgs, "--type", "-t")) runArgs.splice(1, 0, "--type", type);
-    }
-    return withDir(runArgs);
-  }
-
-  return withDir(args);
-}
-
-function withDir(args) {
-  if (hasFlag(args, "--dir", "-d") || args.includes("--help") || args.includes("-h")) return args;
-  const [command, ...rest] = args;
-  return [command, "--dir", ".", ...rest];
-}
-
-function hasFlag(args, longFlag, shortFlag) {
-  return args.some((arg) => arg === longFlag || arg.startsWith(`${longFlag}=`) || arg === shortFlag);
-}
-
-function findPackageTarget(tokens, startIndex) {
-  for (let index = startIndex; index < tokens.length; index += 1) {
-    const token = tokens[index];
-    if (token === "--") continue;
-    if (token === "testkit" || token === "@elench/testkit") return index;
-    if (!token.startsWith("-")) return -1;
-  }
-  return -1;
-}
-
-function firstCommandToken(command) {
-  const tokens = tokenizeShellWords(command);
-  return tokens?.[0] || command.split(/\s+/)[0] || "command";
-}
-
-function containsShellControl(command) {
-  return /[\n;&|<>`]/.test(command);
-}
-
-function tokenizeShellWords(command) {
-  const words = [];
-  let current = "";
-  let quote = null;
-  let escaping = false;
-
-  for (const char of String(command)) {
-    if (escaping) {
-      current += char;
-      escaping = false;
-      continue;
-    }
-    if (char === "\\") {
-      escaping = true;
-      continue;
-    }
-    if (quote) {
-      if (char === quote) {
-        quote = null;
-      } else {
-        current += char;
-      }
-      continue;
-    }
-    if (char === "'" || char === '"') {
-      quote = char;
-      continue;
-    }
-    if (/\s/.test(char)) {
-      if (current) {
-        words.push(current);
-        current = "";
-      }
-      continue;
-    }
-    current += char;
-  }
-
-  if (escaping || quote) return null;
-  if (current) words.push(current);
-  return words;
-}
-
-function shellEscapeArg(value) {
-  const stringValue = String(value);
-  if (/^[a-zA-Z0-9._:@/%+=,-]+$/.test(stringValue)) return stringValue;
-  return `'${stringValue.replace(/'/g, `'\\''`)}'`;
-}

package/lib/cli/command-helpers.mjs

@@ -1,191 +0,0 @@
-import { Flags } from "@oclif/core";
-import path from "path";
-import { loadManagedConfigs } from "../app/configs.mjs";
-import {
-  parseFileTimeoutOption,
-  parseShardOption,
-  parseSuiteOption,
-  parseTypeOption,
-  parseWorkersOption,
-  resolveRequestedFiles,
-} from "./args.mjs";
-import * as runner from "../runner/index.mjs";
-import { createRunReporter } from "./presentation/run-reporter.mjs";
-import { createTreeReporter } from "./presentation/tree-reporter.mjs";
-import { createRunEventsReporter } from "./presentation/events-reporter.mjs";
-
-export const sharedFlags = {
-  dir: Flags.string({
-    description: "Explicit product directory",
-  }),
-  service: Flags.string({
-    description: "Limit the operation or assistant context to one service",
-  }),
-};
-
-export const runFlags = {
-  ...sharedFlags,
-  type: Flags.string({
-    char: "t",
-    multiple: true,
-    description: "Run specific suite type(s): int, e2e, scenario, dal, load, pw, all",
-  }),
-  suite: Flags.string({
-    char: "s",
-    multiple: true,
-    description: "Run specific suite(s)",
-  }),
-  file: Flags.string({
-    char: "f",
-    multiple: true,
-    description: "Run specific file(s)",
-  }),
-  workers: Flags.string({
-    description: "Number of test executors for the whole run",
-  }),
-  "file-timeout-seconds": Flags.string({
-    description: "Per-file wall-clock timeout in seconds",
-  }),
-  shard: Flags.string({
-    description: "Run only shard i of n at suite granularity",
-  }),
-  seed: Flags.string({
-    description: "Deterministic seed for scenario suites",
-  }),
-  "write-status": Flags.boolean({
-    description: "Write a deterministic testkit.status.json snapshot",
-    default: false,
-  }),
-  "allow-partial-status": Flags.boolean({
-    description: "Allow --write-status for filtered runs",
-    default: false,
-  }),
-  "ignore-skip-rules": Flags.boolean({
-    description: "Run files even if testkit.config.ts marks them skipped",
-    default: false,
-  }),
-  "output-mode": Flags.string({
-    description: "Reporter mode",
-    options: ["compact", "debug", "events"],
-  }),
-  debug: Flags.boolean({
-    description: "Alias for --output-mode debug",
-    default: false,
-  }),
-};
-
-export async function resolveConfigsForCommand(flags) {
-  return loadManagedConfigs({ dir: flags.dir, service: flags.service });
-}
-
-export async function executeRunCommand(command, flags, positionalType = null) {
-  const request = await buildRunRequest(flags, positionalType, process.cwd(), process.cwd());
-  const { allConfigs, configs, typeValues, suiteSelectors, productDir } = request;
-  const outputMode = command.jsonEnabled()
-    ? "json"
-    : flags.debug
-      ? "debug"
-      : flags["output-mode"] || "compact";
-
-  let reporter;
-  let finalize = Promise.resolve();
-  let close = () => {};
-
-  if (outputMode === "compact" && process.stdout.isTTY) {
-    const tree = createTreeReporter({
-      stdout: process.stdout,
-      stderr: process.stderr,
-      productDir,
-    });
-    reporter = tree.reporter;
-    finalize = tree.finalize;
-    close = tree.close;
-  } else if (outputMode === "events") {
-    reporter = createRunEventsReporter({ stdout: process.stdout, stderr: process.stderr });
-  } else {
-    reporter = createRunReporter({ outputMode });
-  }
-
-  try {
-    const result = await runner.runAll(
-      configs,
-      typeValues,
-      suiteSelectors,
-      {
-        reporter,
-        ...request.runOptions,
-      },
-      allConfigs
-    );
-    await finalize;
-    return {
-      outputMode,
-      ...result,
-    };
-  } catch (error) {
-    close();
-    await finalize.catch(() => {});
-    throw error;
-  }
-}
-
-export async function buildRunRequest(flags, positionalType = null, cwd = process.cwd(), invocationCwd = process.cwd()) {
-  const { allConfigs, configs } = await resolveConfigsForCommand(flags);
-  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 runStatusLike(commandName, flags) {
-  const { allConfigs, configs } = await resolveConfigsForCommand(flags);
-
-  if (commandName === "cleanup") {
-    await runner.cleanup(allConfigs[0]?.productDir || process.cwd());
-    return { ok: true };
-  }
-
-  const productResults = [];
-  for (const config of configs) {
-    if (commandName === "status") {
-      productResults.push(runner.showStatus(config));
-      continue;
-    }
-    await runner.destroy(config);
-    productResults.push({ name: config.name, destroyed: true });
-  }
-
-  return { ok: true, results: productResults };
-}
-
-export function relativeToProduct(productDir, targetPath) {
-  return path.relative(productDir, targetPath);
-}