@elench/testkit 0.1.94 → 0.1.95

package/lib/cli/agents/providers/codex.mjs

@@ -22,17 +22,14 @@ export function startCodexHostedSession({
 } = {}) {
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "testkit-codex-"));
   const outputFile = path.join(tempDir, "final-message.txt");
-  const args = ["exec", "--json", "-o", outputFile];
-
-  if (purpose === "assistant") {
-    args.push("-s", "read-only");
-  }
-  if (model) {
-    args.push("--model", String(model));
-  }
-  args.push(...normalizeProviderArgs(providerArgs));
-
-  args.push(prompt);
+  const args = buildCodexArgs({
+    outputFile,
+    purpose,
+    model,
+    providerArgs,
+    prompt,
+    sandbox: process.env.TESTKIT_CODEX_SANDBOX,
+  });
 
   const child = execa(command, args, {
     cwd,
@@ -65,6 +62,28 @@ export function startCodexHostedSession({
   };
 }
 
+export function buildCodexArgs({
+  outputFile,
+  purpose = "assistant",
+  model = null,
+  providerArgs = [],
+  prompt = "",
+  sandbox = null,
+} = {}) {
+  const args = ["exec", "--json"];
+  if (outputFile) args.push("-o", outputFile);
+
+  if (purpose === "assistant") {
+    args.push("-s", String(sandbox || "workspace-write"));
+  }
+  if (model) {
+    args.push("--model", String(model));
+  }
+  args.push(...normalizeProviderArgs(providerArgs));
+  args.push(prompt);
+  return args;
+}
+
 function normalizeProviderArgs(providerArgs) {
   if (!Array.isArray(providerArgs)) return [];
   return providerArgs.flatMap((arg) => String(arg || "").split(/\s+/).filter(Boolean));

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

@@ -160,7 +160,8 @@ function buildContextMarkdown(productDir, snapshot, paths) {
   lines.push(
     "",
     "## Guidance",
-    "- Use shell commands like `npm run testkit`, `npx testkit`, or `testkit run --dir . --type <type>` when you need to execute tests.",
+    "- Use shell commands like `npm run testkit`, `npx testkit`, or `testkit run <type> --dir .` when you need to execute tests.",
+    "- 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.",
     ""
@@ -173,15 +174,15 @@ function buildCommandsMarkdown() {
   return [
     "# Testkit Commands",
     "",
-    "- `testkit run --dir . --type int`",
-    "- `testkit run --dir . --type e2e`",
+    "- `testkit run int --dir .`",
+    "- `testkit run e2e --dir .`",
     "- `testkit run --dir . --file path/to/file.testkit.ts`",
     "- `testkit discover --dir .`",
     "- `testkit status --dir .`",
     "- `testkit doctor --dir .`",
     "- `testkit destroy --dir .`",
     "- `npm run testkit`",
-    "- `npx testkit --dir . --type e2e`",
+    "- `npx testkit run e2e --dir .`",
     "",
   ].join("\n");
 }

package/lib/cli/assistant/state.mjs

@@ -177,11 +177,19 @@ export function createAssistantState({
     setProvider(nextProvider) {
       settings = mergeAssistantSettings(settings, { provider: nextProvider || DEFAULT_ASSISTANT_SETTINGS.provider });
       resolvedProviderName = null;
+      if (settings.model && getModelProviderMismatch(resolveInitialProvider(settings.provider, env), settings.model)) {
+        settings = mergeAssistantSettings(settings, { model: null });
+      }
       saveAssistantSettings(productDir, settings);
       notify();
     },
 
     setModel(nextModel) {
+      const resolvedProvider = resolveInitialProvider(settings.provider, env);
+      const mismatch = getModelProviderMismatch(resolvedProvider, nextModel);
+      if (mismatch) {
+        throw new Error(mismatch);
+      }
       settings = mergeAssistantSettings(settings, { model: nextModel || null });
       saveAssistantSettings(productDir, settings);
       notify();
@@ -345,6 +353,22 @@ function resolveInitialProvider(provider, env) {
   return null;
 }
 
+function getModelProviderMismatch(provider, model) {
+  const normalizedModel = String(model || "").trim().toLowerCase();
+  if (!provider || !normalizedModel) return null;
+
+  const looksClaude = /\b(?:opus|sonnet|haiku|claude)\b/.test(normalizedModel);
+  const looksCodex = /\b(?:gpt|codex|o[1-9]|chatgpt)\b/.test(normalizedModel);
+
+  if (provider === "codex" && looksClaude) {
+    return `Model "${model}" looks like a Claude model, but the assistant is using Codex. Run /provider claude or /model default.`;
+  }
+  if (provider === "claude" && looksCodex) {
+    return `Model "${model}" looks like a Codex/OpenAI model, but the assistant is using Claude. Run /provider codex or /model default.`;
+  }
+  return null;
+}
+
 async function executeSlashCommand({
   slash,
   state,
@@ -496,9 +520,16 @@ async function executeSlashTool(slash, context) {
 }
 
 function buildRunSlashCommand(options = {}) {
-  const parts = ["testkit", "run", "--dir", "."];
-  for (const type of options.type || []) {
-    parts.push("--type", type);
+  const types = options.type || [];
+  const parts = ["testkit", "run"];
+  if (types.length === 1) {
+    parts.push(types[0]);
+  }
+  parts.push("--dir", ".");
+  if (types.length !== 1) {
+    for (const type of types) {
+      parts.push("--type", type);
+    }
   }
   for (const suite of options.suite || []) {
     parts.push("--suite", suite);

package/lib/database/template-steps.mjs

@@ -1,7 +1,7 @@
 import fs from "fs";
 import path from "path";
 import { execa } from "execa";
-import { buildExecutionEnv } from "../runner/template.mjs";
+import { buildTemplateExecutionEnv } from "../runner/template.mjs";
 import {
   collectConfiguredInputs,
   runConfiguredSteps,
@@ -13,7 +13,7 @@ export async function runTemplateStage(config, stageName, databaseUrl, options =
   if (steps.length === 0) return;
 
   const env = {
-    ...buildExecutionEnv(config, {}, process.env),
+    ...buildTemplateExecutionEnv(config, {}, process.env),
     DATABASE_URL: databaseUrl,
   };
 
@@ -54,7 +54,7 @@ export async function captureTemplateSnapshot(config, outputPath, databaseUrl, o
     {
       cwd: config.productDir,
       env: {
-        ...buildExecutionEnv(config, {}, process.env),
+        ...buildTemplateExecutionEnv(config, {}, process.env),
         DATABASE_URL: templateDbUrl,
       },
       stdout: "pipe",

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/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.94",
+  "version": "0.1.95",
   "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.94",
+  "version": "0.1.95",
   "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.94"
+    "@elench/testkit-protocol": "0.1.95"
   },
   "private": false
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit-protocol",
-  "version": "0.1.94",
+  "version": "0.1.95",
   "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.94",
+  "version": "0.1.95",
   "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.94",
+  "version": "0.1.95",
   "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.94",
-    "@elench/testkit-bridge": "0.1.94",
-    "@elench/testkit-protocol": "0.1.94",
-    "@elench/ts-analysis": "0.1.94",
+    "@elench/next-analysis": "0.1.95",
+    "@elench/testkit-bridge": "0.1.95",
+    "@elench/testkit-protocol": "0.1.95",
+    "@elench/ts-analysis": "0.1.95",
     "@oclif/core": "^4.10.6",
     "esbuild": "^0.25.11",
     "execa": "^9.5.0",