@elench/testkit 0.1.111 → 0.1.112

package/lib/cli/assistant/state.mjs

@@ -17,6 +17,7 @@ import { parseSlashCommand, formatSlashHelpLines } from "./slash-commands.mjs";
 import { executeAssistantAction } from "./actions.mjs";
 import { runAssistantConversationTurn } from "./session.mjs";
 import { prepareAssistantContextPack } from "./context-pack.mjs";
+import { normalizeCommandLine, unwrapShellCommand } from "./command-normalize.mjs";
 import {
   discoverAssistantModels,
   formatModelChoices,
@@ -88,6 +89,7 @@ export function createAssistantState({
   let activeStatus = null;
   let startupNoticeEmitted = false;
   let lastTurnError = null;
+  let activeTurn = idleTurn();
   let contextUsage = buildContextUsage({
     provider: resolvedProviderName || settings.provider,
     model: settings.model,
@@ -109,6 +111,7 @@ export function createAssistantState({
   function appendMessage(message) {
     const entry = {
       id: `msg-${messages.length + 1}`,
+      ...(activeTurn?.id && !message.turnId ? { turnId: activeTurn.id } : {}),
       ...message,
     };
     messages.push(entry);
@@ -182,6 +185,7 @@ export function createAssistantState({
     commandLog,
     attachRunSession,
     completeRunSession,
+    updateMessage,
 
     async loadLatestArtifact() {
       try {
@@ -364,7 +368,8 @@ export function createAssistantState({
         startupNoticeEmitted = true;
         appendMessage({ role: "system", text: notice });
       }
-      appendMessage({ role: "user", text: trimmed });
+      const turnId = createAssistantTurnId();
+      appendMessage({ role: "user", text: trimmed, turnId });
 
       const slash = parseSlashCommandSafe(trimmed);
       if (slash?.type === "__error__") {
@@ -373,6 +378,8 @@ export function createAssistantState({
       }
       if (slash) {
         try {
+          activeTurn = { id: turnId, state: "slash_running", input: trimmed, startedAt: new Date().toISOString() };
+          commandLog.setActiveTurnId?.(turnId);
           setBusy(true, `Running ${slash.type}...`);
           await executeSlashCommand({
             slash,
@@ -389,6 +396,14 @@ export function createAssistantState({
             text: error instanceof Error ? error.message : String(error),
           });
         } finally {
+          commandLog.setActiveTurnId?.(null);
+          activeTurn = {
+            id: turnId,
+            state: "idle",
+            input: trimmed,
+            startedAt: activeTurn?.startedAt || new Date().toISOString(),
+            finishedAt: new Date().toISOString(),
+          };
           setBusy(false, null);
         }
         refreshContextPack();
@@ -397,6 +412,8 @@ export function createAssistantState({
       }
 
       try {
+        activeTurn = { id: turnId, state: "provider_running", input: trimmed, startedAt: new Date().toISOString() };
+        commandLog.setActiveTurnId?.(turnId);
         setBusy(true, `Thinking with ${settings.provider === "auto" ? "provider" : settings.provider}...`);
         const providerTurn = createProviderTurnState();
         await runAssistantConversationTurn({
@@ -405,6 +422,7 @@ export function createAssistantState({
           transcript: buildConversationTranscript(messages),
           userMessage: trimmed,
           settings,
+          turnId,
           env,
           configs,
           commandLog,
@@ -447,8 +465,26 @@ export function createAssistantState({
           role: "system",
           text: lastTurnError.message,
         });
+        activeTurn = {
+          id: turnId,
+          state: "failed",
+          input: trimmed,
+          startedAt: activeTurn?.startedAt || new Date().toISOString(),
+          failedAt: new Date().toISOString(),
+          error: lastTurnError,
+        };
       } finally {
+        commandLog.setActiveTurnId?.(null);
         refreshContextPack();
+        if (activeTurn?.id === turnId && activeTurn.state !== "failed") {
+          activeTurn = {
+            id: turnId,
+            state: "idle",
+            input: trimmed,
+            startedAt: activeTurn?.startedAt || new Date().toISOString(),
+            finishedAt: new Date().toISOString(),
+          };
+        }
         setBusy(false, null);
       }
     },
@@ -459,11 +495,13 @@ export function createAssistantState({
     },
 
     getSnapshot() {
+      const snapshotMessages = messages.map(serializeMessageForSnapshot);
       return {
         context: buildContextSelection(runState.getSnapshot()),
         run: runState.getSnapshot(),
         productDir,
-        messages: messages.map(serializeMessageForSnapshot),
+        messages: snapshotMessages,
+        activities: buildSnapshotActivities(snapshotMessages),
         composer: composerState.text,
         composerCursor: composerState.cursor,
         notice,
@@ -475,6 +513,7 @@ export function createAssistantState({
         providerArgs: [...settings.providerArgs],
         cliConfig,
         activeStatus,
+        turn: activeTurn,
         lastTurnError,
         diagnostics: [...diagnostics],
         contextUsage,
@@ -508,6 +547,17 @@ function resolveInitialProvider(provider, env) {
   return null;
 }
 
+function idleTurn() {
+  return {
+    id: null,
+    state: "idle",
+  };
+}
+
+function createAssistantTurnId(now = Date.now(), random = Math.random) {
+  return `turn-${now}-${random().toString(36).slice(2, 10)}`;
+}
+
 async function executeSlashCommand({
   slash,
   state,
@@ -664,6 +714,7 @@ function handleAssistantToolEvent(state, event, appendMessage) {
     return;
   }
   if (event.type === "observed-testkit-command") {
+    suppressMatchingProviderCommand(state, event.command);
     appendMessage({
       role: "tool",
       toolName: event.command?.kind || "testkit",
@@ -679,6 +730,28 @@ function handleAssistantToolEvent(state, event, appendMessage) {
   }
 }
 
+function suppressMatchingProviderCommand(state, command) {
+  const observed = normalizeCommandLine(formatObservedCommandLine(command));
+  if (!observed) return;
+  const snapshot = state.getSnapshot();
+  for (const message of snapshot.messages || []) {
+    if (message.role !== "provider-tool") continue;
+    const providerCommand = normalizeCommandLine(providerToolCommandLine(message.data));
+    if (!providerCommand || providerCommand !== observed) continue;
+    state.updateMessage?.(message.id, (current) => ({
+      data: {
+        ...(current.data || {}),
+        supersededByTestkitCommand: command?.commandId || true,
+      },
+    }));
+  }
+}
+
+function providerToolCommandLine(event) {
+  if (!event) return null;
+  return event.input || event.data?.command || event.data?.input || null;
+}
+
 function createProviderTurnState() {
   return {
     assistantMessageId: null,
@@ -940,6 +1013,40 @@ function serializeMessageForSnapshot(message) {
   };
 }
 
+function buildSnapshotActivities(messages) {
+  return (messages || []).map((message) => {
+    const base = {
+      id: message.id,
+      turnId: message.turnId || null,
+      title: message.title || null,
+      text: message.text || "",
+      status: message.status || null,
+      data: message.data || null,
+    };
+    if (message.role === "user") return { ...base, kind: "user_message" };
+    if (message.role === "assistant") return { ...base, kind: "assistant_message" };
+    if (message.role === "provider-tool") {
+      return {
+        ...base,
+        kind: "provider_command",
+        command: providerToolCommandLine(message.data),
+        supersededBy: message.data?.supersededByTestkitCommand || null,
+      };
+    }
+    if (message.role === "provider-activity") return { ...base, kind: "provider_status" };
+    if (message.role === "tool" && message.data?.testkitRelated) {
+      const kind = message.data?.kind === "run" ? "testkit_run" : "testkit_command";
+      return {
+        ...base,
+        kind,
+        command: message.data?.command || null,
+        commandId: message.data?.commandId || null,
+      };
+    }
+    return { ...base, kind: "system_message" };
+  });
+}
+
 function buildConversationTranscript(messages) {
   return (messages || [])
     .filter((entry) => !["provider-activity", "provider-tool", "provider-error"].includes(entry.role))

package/lib/cli/assistant/view-model.mjs

@@ -1,5 +1,6 @@
 import path from "path";
 import { formatContextRemaining } from "./context-window.mjs";
+import { normalizeCommandLine, unwrapShellCommand } from "./command-normalize.mjs";
 
 const PROVIDER_COMMAND_OUTPUT_PREVIEW_LINES = 12;
 const PROVIDER_FILE_READ_OUTPUT_PREVIEW_LINES = 8;
@@ -13,7 +14,7 @@ export function buildAssistantViewModel(snapshot, { cwd = process.cwd(), termina
     title: `testkit · ${repoName}`,
     welcome: buildWelcomeModel(snapshot, { cwd, providerLabel }),
     qualitySignal: buildQualitySignal(snapshot),
-    blocks: buildTranscriptBlocks(snapshot.messages || []),
+    blocks: snapshot.activities ? buildActivityBlocks(snapshot.activities) : buildTranscriptBlocks(snapshot.messages || []),
     composer: {
       text: snapshot.composer || "",
       cursor: snapshot.composerCursor ?? 0,
@@ -134,7 +135,8 @@ export function buildWelcomeModel(snapshot, { cwd = process.cwd(), providerLabel
 }
 
 export function buildTranscriptBlocks(messages) {
-  return (messages || []).map((message) => {
+  const visibleMessages = filterSupersededProviderCommands(messages || []);
+  return visibleMessages.map((message) => {
     const role = message.role || "system";
     if (role === "tool") {
       const outputPreview = summarizeOutput(message.text || "", TESTKIT_COMMAND_OUTPUT_PREVIEW_LINES);
@@ -204,6 +206,71 @@ export function buildTranscriptBlocks(messages) {
   });
 }
 
+export function buildActivityBlocks(activities) {
+  const messages = (activities || [])
+    .filter((activity) => !activity.supersededBy)
+    .map((activity) => {
+      if (activity.kind === "user_message") return { id: activity.id, role: "user", text: activity.text || "" };
+      if (activity.kind === "assistant_message") return { id: activity.id, role: "assistant", text: activity.text || "" };
+      if (activity.kind === "provider_command") {
+        return {
+          id: activity.id,
+          role: "provider-tool",
+          title: activity.title || "provider command",
+          text: activity.text || "",
+          status: activity.status || null,
+          data: {
+            ...(activity.data || {}),
+            input: activity.command || activity.data?.input || null,
+          },
+        };
+      }
+      if (activity.kind === "provider_status") {
+        return {
+          id: activity.id,
+          role: "provider-activity",
+          title: activity.title || null,
+          text: activity.text || "",
+          status: activity.status || null,
+        };
+      }
+      if (activity.kind === "testkit_command" || activity.kind === "testkit_run") {
+        return {
+          id: activity.id,
+          role: "tool",
+          title: activity.title || (activity.kind === "testkit_run" ? "testkit run" : "testkit command"),
+          text: activity.text || "",
+          status: activity.status || null,
+          data: {
+            ...(activity.data || {}),
+            testkitRelated: true,
+            kind: activity.kind === "testkit_run" ? "run" : activity.data?.kind,
+            command: activity.command || activity.data?.command || null,
+            commandId: activity.commandId || activity.data?.commandId || null,
+          },
+        };
+      }
+      return { id: activity.id, role: "system", title: activity.title || null, text: activity.text || "" };
+    });
+  return buildTranscriptBlocks(messages);
+}
+
+function filterSupersededProviderCommands(messages) {
+  const observedCommands = new Set(
+    (messages || [])
+      .filter((message) => message.role === "tool" && message.data?.testkitRelated)
+      .map((message) => normalizeCommandLine(message.data?.command))
+      .filter(Boolean)
+  );
+  return (messages || []).filter((message) => {
+    if (message.role !== "provider-tool") return true;
+    if (message.data?.supersededByTestkitCommand) return false;
+    const providerCommand = normalizeCommandLine(message.data?.input || message.data?.data?.command || message.data?.data?.input);
+    if (!providerCommand) return true;
+    return !observedCommands.has(providerCommand);
+  });
+}
+
 export function buildStatusLine(snapshot, { cwd = process.cwd(), providerLabel = null } = {}) {
   const context = formatContextRemaining(snapshot.contextUsage);
   const provider = providerLabel || buildProviderLabel(snapshot);
@@ -339,13 +406,6 @@ function isDiffProducingShellCommand(command) {
   return /^((git\s+diff|git\s+show|diff|apply_patch)\b|.*\bapply_patch\b)/.test(normalized);
 }
 
-function unwrapShellCommand(command) {
-  const text = String(command || "").trim();
-  const match = text.match(/(?:^|\s)(?:[^\s'"]*\/)?(?:bash|sh|zsh)\s+-lc\s+(['"])([\s\S]*)\1\s*$/);
-  if (!match) return text;
-  return match[2].replace(/\\(["'\\$`])/g, "$1").trim();
-}
-
 function stringifyMaybe(value) {
   if (value == null) return "";
   if (typeof value === "string") return value;

package/lib/cli/commands/run.mjs

@@ -14,7 +14,7 @@ export default class RunCommand extends Command {
     type: Args.string({
       description: `Optional suite type shortcut: ${publicTestTypeListText({ includeAll: true })}`,
       required: false,
-      options: publicTestTypeList({ includeAll: true, includeLegacy: true }),
+      options: publicTestTypeList({ includeAll: true }),
     }),
   };
 

package/lib/cli/components/blocks/run-tree.mjs

@@ -25,8 +25,9 @@ export function RunTreeView({
   interactive = true,
 } = {}) {
   const { exit } = useApp();
+  const controlledSnapshot = Boolean(snapshotOverride);
   const [snapshot, setSnapshot] = useState(() => snapshotOverride || runState.getSnapshot());
-  const { frame } = useAnimation({ interval: 80, isActive: !snapshot.finished });
+  const { frame } = useAnimation({ interval: 80, isActive: !controlledSnapshot && !snapshot.finished });
   const spinnerFrame = SPINNER_FRAMES[frame % SPINNER_FRAMES.length];
 
   useEffect(() => {

package/lib/cli/entrypoint.mjs

@@ -16,7 +16,7 @@ export function normalizeCliArgs(argv) {
     "browser",
     "db",
   ]);
-  const runTypeShortcuts = new Set(publicTestTypeList({ includeAll: true, includeLegacy: true }));
+  const runTypeShortcuts = new Set(publicTestTypeList({ includeAll: true }));
   const valueFlags = new Set([
     "--dir",
     "--service",

package/lib/config/discovery.mjs

@@ -16,7 +16,6 @@ const DISCOVERY_RULES = [
   { suffix: ".dal.testkit.ts", type: "dal", framework: "k6" },
   { suffix: ".load.testkit.ts", type: "load", framework: "k6" },
   { suffix: ".ui.testkit.ts", type: "ui", framework: "playwright" },
-  { suffix: ".pw.testkit.ts", type: "ui", framework: "playwright", legacySuffix: true },
 ];
 
 export function discoverProject(productDir, explicitServices = {}, options = {}) {
@@ -31,15 +30,6 @@ export function discoverProject(productDir, explicitServices = {}, options = {})
   for (const filePath of suiteFiles) {
     const rule = inferRule(filePath);
     if (!rule) continue;
-    if (rule.legacySuffix) {
-      diagnostics.push({
-        code: "legacy_ui_suffix",
-        severity: "warning",
-        message: `Legacy UI test suffix ".pw.testkit.ts" is deprecated. Rename to ".ui.testkit.ts": ${filePath}`,
-        path: filePath,
-      });
-    }
-
     const owners = inferOwners(filePath, explicitServices, repoDiscovery);
     if (owners === null) continue;
     if (owners.length === 0) {

package/lib/discovery/index.mjs

@@ -489,7 +489,7 @@ function normalizePath(filePath) {
 export function fileDisplayName(filePath) {
   const base = path.posix
     .basename(filePath)
-    .replace(/(\.int|\.e2e|\.scenario|\.dal|\.load|\.ui|\.pw)\.testkit\.ts$/, "");
+    .replace(/(\.int|\.e2e|\.scenario|\.dal|\.load|\.ui)\.testkit\.ts$/, "");
   return formatDisplayName(base);
 }
 

package/lib/domain/test-types.mjs

@@ -2,9 +2,6 @@ export const TEST_TYPE_ORDER = ["ui", "e2e", "scenario", "int", "dal", "load"];
 export const TEST_TYPES = new Set(TEST_TYPE_ORDER);
 export const RUN_TYPE_ORDER = [...TEST_TYPE_ORDER, "all"];
 export const RUN_TYPES = new Set(RUN_TYPE_ORDER);
-export const LEGACY_TEST_TYPE_ALIASES = new Map([
-  ["pw", "ui"],
-]);
 
 const TEST_TYPE_LABELS = {
   ui: "UI",
@@ -15,28 +12,22 @@ const TEST_TYPE_LABELS = {
   load: "Load",
 };
 
-export function normalizePublicTestType(value) {
-  const normalized = String(value || "").trim();
-  return LEGACY_TEST_TYPE_ALIASES.get(normalized) || normalized;
-}
-
 export function isPublicTestType(value) {
-  return TEST_TYPES.has(normalizePublicTestType(value));
+  return TEST_TYPES.has(String(value || "").trim());
 }
 
 export function isRunType(value) {
-  const normalized = normalizePublicTestType(value);
+  const normalized = String(value || "").trim();
   return normalized === "all" || TEST_TYPES.has(normalized);
 }
 
 export function formatPublicTestType(value) {
-  const normalized = normalizePublicTestType(value);
+  const normalized = String(value || "").trim();
   return TEST_TYPE_LABELS[normalized] || String(value || "");
 }
 
-export function publicTestTypeList({ includeAll = false, includeLegacy = false } = {}) {
-  const values = includeAll ? RUN_TYPE_ORDER : TEST_TYPE_ORDER;
-  return includeLegacy ? [...values, "pw"] : [...values];
+export function publicTestTypeList({ includeAll = false } = {}) {
+  return includeAll ? [...RUN_TYPE_ORDER] : [...TEST_TYPE_ORDER];
 }
 
 export function publicTestTypeListText(options = {}) {

package/lib/runner/maintenance.mjs

@@ -90,7 +90,7 @@ export async function cleanup(productDir, options = {}) {
   appendBoundedFileCleanupLines(lines, {
     productDir,
     targets: targets.assistant,
-    label: "assistant command result",
+    label: "assistant session",
     dryRun,
   });
 

package/lib/runner/provenance.mjs

@@ -1,13 +1,16 @@
 const ASSISTANT_SESSION_ENV = "TESTKIT_ASSISTANT_SESSION_ID";
+const ASSISTANT_TURN_ENV = "TESTKIT_ASSISTANT_TURN_ID";
 const ASSISTANT_COMMAND_ID_ENV = "TESTKIT_ASSISTANT_COMMAND_ID";
 
 export function buildRunProvenance(env = process.env) {
   const sessionId = normalizeOptionalString(env?.[ASSISTANT_SESSION_ENV]);
+  const turnId = normalizeOptionalString(env?.[ASSISTANT_TURN_ENV]);
   const commandId = normalizeOptionalString(env?.[ASSISTANT_COMMAND_ID_ENV]);
-  if (!sessionId && !commandId) return null;
+  if (!sessionId && !turnId && !commandId) return null;
   return {
     assistant: {
       sessionId,
+      turnId,
       commandId,
     },
   };

package/lib/runner/status-model.mjs

@@ -242,13 +242,21 @@ export function collectBundleCleanupTargets(productDir, { allConfigs = [], servi
 export function collectAssistantCleanupTargets(productDir) {
   const now = Date.now();
   const dir = path.join(productDir, ".testkit", "assistant", "sessions");
-  return listFiles(dir)
-    .filter((file) => file.size >= ASSISTANT_LARGE_RESULT_BYTES || now - file.mtimeMs >= ASSISTANT_RESULT_TTL_MS)
-    .map((file) => ({
-      path: file.path,
-      reason: file.size >= ASSISTANT_LARGE_RESULT_BYTES ? "large" : "expired",
-      sizeBytes: file.size,
-    }));
+  return listDirectories(dir)
+    .map((sessionDir) => {
+      const files = listFiles(sessionDir);
+      const sizeBytes = files.reduce((sum, file) => sum + file.size, 0);
+      const newestMtimeMs = files.reduce((latest, file) => Math.max(latest, file.mtimeMs), 0);
+      const expired = newestMtimeMs > 0 && now - newestMtimeMs >= ASSISTANT_RESULT_TTL_MS;
+      const large = sizeBytes >= ASSISTANT_LARGE_RESULT_BYTES;
+      if (!expired && !large) return null;
+      return {
+        path: sessionDir,
+        reason: large ? "large" : "expired",
+        sizeBytes,
+      };
+    })
+    .filter(Boolean);
 }
 
 function listDirectories(dir) {

package/lib/runner/suite-selection.mjs

@@ -3,7 +3,6 @@ import {
   RUN_TYPES,
   TEST_TYPE_ORDER,
   TEST_TYPES,
-  normalizePublicTestType,
   publicTestTypeListText,
 } from "../domain/test-types.mjs";
 
@@ -14,7 +13,7 @@ export function normalizeTypeValues(values = []) {
     for (const part of String(rawValue).split(",")) {
       const value = part.trim();
       if (!value) continue;
-      const normalized = normalizePublicTestType(value);
+      const normalized = value;
       if (!RUN_TYPES.has(normalized)) {
         throw new Error(
           `Unknown type "${value}". Expected one of: ${publicTestTypeListText({ includeAll: true })}.`
@@ -57,7 +56,7 @@ export function parseSuiteSelectors(values = []) {
 
       const type = typeMatch[1];
       const name = typeMatch[2].trim();
-      const normalizedType = normalizePublicTestType(type);
+      const normalizedType = type.trim();
       if (!TEST_TYPES.has(normalizedType)) {
         throw new Error(
           `Unknown suite selector type "${type}". Expected one of: ${publicTestTypeListText()}.`

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

@@ -1,6 +1,6 @@
 {
   "name": "@elench/next-analysis",
-  "version": "0.1.111",
+  "version": "0.1.112",
   "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.111",
+  "version": "0.1.112",
   "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.111"
+    "@elench/testkit-protocol": "0.1.112"
   },
   "private": false
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit-protocol",
-  "version": "0.1.111",
+  "version": "0.1.112",
   "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.111",
+  "version": "0.1.112",
   "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.111",
+  "version": "0.1.112",
   "description": "Assistant-first CLI for running, inspecting, and debugging local testkit suites",
   "type": "module",
   "workspaces": [
@@ -90,10 +90,10 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.29.0",
-    "@elench/next-analysis": "0.1.111",
-    "@elench/testkit-bridge": "0.1.111",
-    "@elench/testkit-protocol": "0.1.111",
-    "@elench/ts-analysis": "0.1.111",
+    "@elench/next-analysis": "0.1.112",
+    "@elench/testkit-bridge": "0.1.112",
+    "@elench/testkit-protocol": "0.1.112",
+    "@elench/ts-analysis": "0.1.112",
     "@oclif/core": "^4.10.6",
     "@playwright/test": "^1.52.0",
     "esbuild": "^0.25.11",