@elench/testkit 0.1.110 → 0.1.112

package/README.md

@@ -2,7 +2,7 @@
 
 `@elench/testkit` discovers `*.testkit.ts` files, infers suite ownership from the
 filesystem, starts local services, provisions Docker-managed local Postgres
-databases, and runs HTTP, DAL, and Playwright suites.
+databases, and runs test suites.
 
 The package is now driven by `testkit.config.ts`, not `testkit.config.json`.
 

package/lib/cli/args.mjs

@@ -6,7 +6,7 @@ import {
   parseWorkersOption,
 } from "../runner/execution-config.mjs";
 
-export const POSITIONAL_TYPES = new Set(publicTestTypeList({ includeAll: true, includeLegacy: true }));
+export const POSITIONAL_TYPES = new Set(publicTestTypeList({ includeAll: true }));
 export const LIFECYCLE = new Set(["status", "destroy", "cleanup"]);
 export const RESERVED = new Set([...POSITIONAL_TYPES, ...LIFECYCLE]);
 

package/lib/cli/assistant/actions.mjs

@@ -60,13 +60,16 @@ function readContextAction(args, context) {
 function readFileAction(args, context) {
   const file = String(args.path || args.file || "").trim();
   if (!file) throw new Error("read_file requires a path");
-  const resolved = path.resolve(context.productDir, file);
-  if (!resolved.startsWith(path.resolve(context.productDir))) {
-    throw new Error("read_file only supports paths inside the current repository");
-  }
+  const root = fs.realpathSync(path.resolve(context.productDir));
+  const resolved = path.resolve(root, file);
   if (!fs.existsSync(resolved)) {
     throw new Error(`File not found: ${file}`);
   }
+  const realResolved = fs.realpathSync(resolved);
+  const relativeResolved = path.relative(root, realResolved);
+  if (relativeResolved.startsWith("..") || path.isAbsolute(relativeResolved)) {
+    throw new Error("read_file only supports paths inside the current repository");
+  }
   const startLine = Math.max(1, Number(args.startLine || args.start || 1) || 1);
   const requestedEnd = Number(args.endLine || args.end || startLine + FILE_LINE_LIMIT - 1) || startLine + FILE_LINE_LIMIT - 1;
   const endLine = Math.max(startLine, Math.min(requestedEnd, startLine + FILE_LINE_LIMIT - 1));
@@ -75,14 +78,14 @@ function readFileAction(args, context) {
   for (let lineNumber = startLine; lineNumber <= Math.min(endLine, lines.length); lineNumber += 1) {
     selected.push(`${lineNumber}: ${lines[lineNumber - 1]}`);
   }
-  const title = `File ${path.relative(context.productDir, resolved) || path.basename(resolved)}`;
+  const title = `File ${relativeResolved || path.basename(realResolved)}`;
   return {
     ok: true,
     title,
     text: selected.join("\n"),
     data: {
-      path: resolved,
-      relativePath: path.relative(context.productDir, resolved),
+      path: realResolved,
+      relativePath: relativeResolved,
       startLine,
       endLine,
       lines: selected,

package/lib/cli/assistant/app.mjs

@@ -2,15 +2,16 @@ import React, { createElement, useEffect, useMemo, useRef, useState } from "reac
 import { Box, Text, useApp, useBoxMetrics, useCursor, useInput, useStdout } from "ink";
 import { bold, cyan, dim, green, red, yellow } from "../terminal/colors.mjs";
 import { RunTreeView } from "../components/blocks/run-tree.mjs";
-import { CodeBlock } from "./code-block.mjs";
+import { colorCodeLine } from "./code-block.mjs";
 import { getComposerDisplayModel } from "./composer.mjs";
 import { MarkdownBlock } from "./markdown-block.mjs";
 import { QualitySignalStrip } from "./quality-signal-strip.mjs";
 import { buildAssistantViewModel } from "./view-model.mjs";
-import { truncateText, wrapText } from "../terminal/layout.mjs";
+import { truncateText } from "../terminal/layout.mjs";
 
 const FALLBACK_COMMAND_BLOCK_WIDTH = 100;
 const COMMAND_BLOCK_CHROME_WIDTH = 4;
+const COMMAND_BLOCK_BODY_ROWS = 8;
 
 export function AssistantApp({
   assistantState,
@@ -58,6 +59,10 @@ export function AssistantApp({
   const runSession = assistantState.getLiveRunSession?.() || assistantState.getLastRunSession?.() || null;
   const serializedRunSession = snapshot.liveRunSession || snapshot.lastRunSession || null;
   const runSessionProductDir = serializedRunSession?.productDir || runSession?.productDir || snapshot.productDir;
+  const visibleBlocks = useMemo(
+    () => runSession ? view.blocks.filter((block) => !isRunCommandBlock(block)) : view.blocks,
+    [runSession, view.blocks]
+  );
 
   return createElement(
     Box,
@@ -70,9 +75,9 @@ export function AssistantApp({
         })
       : null,
     createElement(HeaderChrome, { view }),
-    view.blocks.length === 0
+    visibleBlocks.length === 0
       ? createElement(WelcomePanel, { view })
-      : createElement(Transcript, { view }),
+      : createElement(Transcript, { view: { ...view, blocks: visibleBlocks } }),
     runSession
       ? createElement(
           Box,
@@ -105,6 +110,12 @@ export function AssistantApp({
   );
 }
 
+function isRunCommandBlock(block) {
+  if (!block || block.kind !== "testkit-run") return false;
+  const command = String(block.command || "").trim();
+  return /^testkit\s+(run\s+)?(ui|e2e|scenario|int|dal|load|all|run)\b/.test(command);
+}
+
 function HeaderChrome({ view }) {
   const provider = view.welcome.rows.find(([label]) => label === "Provider")?.[1] || "";
   return createElement(
@@ -257,12 +268,16 @@ function renderCommandBlock(block, view = {}) {
     : block.outputPreview?.omittedLineCount || block.omittedOutputLineCount || 0;
   const blockWidth = Math.max(1, Number(view.terminalWidth) || FALLBACK_COMMAND_BLOCK_WIDTH);
   const contentWidth = Math.max(1, blockWidth - COMMAND_BLOCK_CHROME_WIDTH);
-  const commandLines = command ? wrapText(`${dim("$")} ${command}`, contentWidth) : [];
+  const commandLine = command ? truncateText(`${dim("$")} ${command}`, contentWidth) : null;
   const statusLine = status ? truncateText(status, contentWidth) : null;
-  const previewLines = outputLines.map((line) => truncateText(line, contentWidth));
-  const omittedLine = omitted > 0
-    ? truncateText(`… ${omitted} more line${omitted === 1 ? "" : "s"} omitted`, contentWidth)
-    : null;
+  const bodyRows = buildCommandBodyRows({
+    commandLine,
+    statusLine,
+    codeBlock,
+    outputLines,
+    omitted,
+    contentWidth,
+  });
 
   return [
     createElement(
@@ -277,21 +292,56 @@ function renderCommandBlock(block, view = {}) {
         width: blockWidth,
       },
       createElement(Text, { key: "title" }, `${marker} ${title}`),
-      ...commandLines.map((line, index) => createElement(Text, { key: `command-${index}` }, line)),
-      statusLine ? createElement(Text, { key: "status" }, colorCommandStatus(block, statusLine)) : null,
-      codeBlock ? createElement(Text, { key: "code-gap" }, "") : null,
-      ...(codeBlock ? CodeBlock({ lines: codeBlock.lines, language: codeBlock.language, width: contentWidth }) : []),
-      ...previewLines.map((line, index) => (
-        createElement(Text, { key: `output-${index}` }, dim(line))
-      )),
-      omittedLine ? createElement(Text, { key: "omitted" }, dim(omittedLine)) : null,
-      block.text && !command && outputLines.length === 0
-        ? createElement(Text, { key: "text" }, colorBlockText(block, truncateText(block.text, contentWidth)))
-        : null
+      ...bodyRows.map((row, index) => renderCommandBodyRow(block, row, index)),
     ),
   ];
 }
 
+function buildCommandBodyRows({ commandLine, statusLine, codeBlock, outputLines = [], omitted = 0, contentWidth }) {
+  const rows = [];
+  if (commandLine) rows.push({ tone: "command", text: commandLine });
+  if (statusLine) rows.push({ tone: "status", text: statusLine });
+
+  if (codeBlock) {
+    const available = Math.max(0, COMMAND_BLOCK_BODY_ROWS - rows.length - (omitted > 0 ? 1 : 0));
+    for (const line of (codeBlock.lines || []).slice(0, available)) {
+      rows.push({ tone: "code", language: codeBlock.language, text: truncateText(line, contentWidth) });
+    }
+    const omittedCount = Math.max(omitted, (codeBlock.lines || []).length - available);
+    if (omittedCount > 0 && rows.length < COMMAND_BLOCK_BODY_ROWS) {
+      rows.push({ tone: "muted", text: truncateText(`… ${omittedCount} more line${omittedCount === 1 ? "" : "s"} omitted`, contentWidth) });
+    }
+  } else {
+    const available = Math.max(0, COMMAND_BLOCK_BODY_ROWS - rows.length - (omitted > 0 ? 1 : 0));
+    for (const line of outputLines.slice(0, available)) {
+      rows.push({ tone: "muted", text: truncateText(line, contentWidth) });
+    }
+    const omittedCount = Math.max(omitted, outputLines.length - available);
+    if (omittedCount > 0 && rows.length < COMMAND_BLOCK_BODY_ROWS) {
+      rows.push({ tone: "muted", text: truncateText(`… ${omittedCount} more line${omittedCount === 1 ? "" : "s"} omitted`, contentWidth) });
+    }
+  }
+
+  while (rows.length < COMMAND_BLOCK_BODY_ROWS) rows.push({ tone: "blank", text: "" });
+  return rows.slice(0, COMMAND_BLOCK_BODY_ROWS);
+}
+
+function renderCommandBodyRow(block, row, index) {
+  if (row.tone === "status") {
+    return createElement(Text, { key: `body-${index}` }, colorCommandStatus(block, row.text));
+  }
+  if (row.tone === "code") {
+    return createElement(Text, { key: `body-${index}` }, colorCodeLine(row.text, row.language));
+  }
+  if (row.tone === "muted") {
+    return createElement(Text, { key: `body-${index}` }, dim(row.text));
+  }
+  if (row.tone === "blank") {
+    return createElement(Text, { key: `body-${index}` }, "");
+  }
+  return createElement(Text, { key: `body-${index}` }, row.text);
+}
+
 function formatCommandLine(block) {
   if (!block.command) return null;
   if (typeof block.command === "string") return block.command;

package/lib/cli/assistant/command-classifier.d.mts

@@ -0,0 +1,6 @@
+export declare const ASSISTANT_RUN_SHORTCUTS: readonly string[];
+export declare const ASSISTANT_COMMAND_VALUE_FLAGS: readonly string[];
+export type AssistantObservedCommandKind = "run" | "discover" | "status" | "doctor" | "typecheck" | string;
+export declare function classifyAssistantCommandKind(argv?: readonly string[]): AssistantObservedCommandKind;
+export declare function isAssistantRunCommand(kind: string | null | undefined, argv?: readonly string[]): boolean;
+//# sourceMappingURL=command-classifier.d.mts.map

package/lib/cli/assistant/command-classifier.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"command-classifier.d.mts","sourceRoot":"","sources":["../../../src/cli/assistant/command-classifier.mts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uBAAuB,mBAQlC,CAAC;AAEH,eAAO,MAAM,6BAA6B,mBAUxC,CAAC;AAEH,MAAM,MAAM,4BAA4B,GACpC,KAAK,GACL,UAAU,GACV,QAAQ,GACR,QAAQ,GACR,WAAW,GACX,MAAM,CAAC;AAEX,wBAAgB,4BAA4B,CAAC,IAAI,GAAE,SAAS,MAAM,EAAO,GAAG,4BAA4B,CAIvG;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,IAAI,GAAE,SAAS,MAAM,EAAO,GAAG,OAAO,CAK5G"}

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

@@ -0,0 +1,48 @@
+export const ASSISTANT_RUN_SHORTCUTS = Object.freeze([
+    "ui",
+    "e2e",
+    "scenario",
+    "int",
+    "dal",
+    "load",
+    "all",
+]);
+export const ASSISTANT_COMMAND_VALUE_FLAGS = Object.freeze([
+    "--dir",
+    "--service",
+    "--type",
+    "--suite",
+    "--file",
+    "--workers",
+    "--file-timeout-seconds",
+    "--seed",
+    "--output-mode",
+]);
+export function classifyAssistantCommandKind(argv = []) {
+    const first = findFirstPositional(argv, ASSISTANT_COMMAND_VALUE_FLAGS);
+    if (!first || ASSISTANT_RUN_SHORTCUTS.includes(first))
+        return "run";
+    return first;
+}
+export function isAssistantRunCommand(kind, argv = []) {
+    if (kind === "run")
+        return true;
+    if (kind && ASSISTANT_RUN_SHORTCUTS.includes(kind))
+        return true;
+    const first = argv[0] || null;
+    return first === "run" || Boolean(first && ASSISTANT_RUN_SHORTCUTS.includes(first));
+}
+function findFirstPositional(args, flagsWithValues) {
+    const valueFlags = new Set(flagsWithValues);
+    for (let index = 0; index < args.length; index += 1) {
+        const value = String(args[index] || "");
+        if (valueFlags.has(value)) {
+            index += 1;
+            continue;
+        }
+        if (!value.startsWith("-"))
+            return value;
+    }
+    return null;
+}
+//# sourceMappingURL=command-classifier.mjs.map

package/lib/cli/assistant/command-classifier.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"command-classifier.mjs","sourceRoot":"","sources":["../../../src/cli/assistant/command-classifier.mts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC;IACnD,IAAI;IACJ,KAAK;IACL,UAAU;IACV,KAAK;IACL,KAAK;IACL,MAAM;IACN,KAAK;CACN,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,MAAM,CAAC;IACzD,OAAO;IACP,WAAW;IACX,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,WAAW;IACX,wBAAwB;IACxB,QAAQ;IACR,eAAe;CAChB,CAAC,CAAC;AAUH,MAAM,UAAU,4BAA4B,CAAC,OAA0B,EAAE;IACvE,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,EAAE,6BAA6B,CAAC,CAAC;IACvE,IAAI,CAAC,KAAK,IAAI,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACpE,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAA+B,EAAE,OAA0B,EAAE;IACjG,IAAI,IAAI,KAAK,KAAK;QAAE,OAAO,IAAI,CAAC;IAChC,IAAI,IAAI,IAAI,uBAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAChE,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAC9B,OAAO,KAAK,KAAK,KAAK,IAAI,OAAO,CAAC,KAAK,IAAI,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAuB,EAAE,eAAkC;IACtF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC;IAC5C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACxC,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,KAAK,IAAI,CAAC,CAAC;YACX,SAAS;QACX,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;IAC3C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

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

@@ -0,0 +1,22 @@
+export function normalizeCommandLine(value) {
+  const text = unwrapShellCommand(value)
+    .replace(/\s+/g, " ")
+    .trim();
+  if (!text) return null;
+  return canonicalizeTestkitInvocation(text);
+}
+
+export function unwrapShellCommand(value) {
+  const text = String(value || "").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 canonicalizeTestkitInvocation(command) {
+  return command
+    .replace(/^npx\s+(?:--yes\s+|-y\s+)?testkit\b/, "testkit")
+    .replace(/^node(?:\s+--[^\s]+)*\s+(?:(?:\.?\.?\/)?[^\s]+\/)?(?:bin\/)?testkit(?:\.(?:mjs|js))?\b/, "testkit")
+    .replace(/^(?:(?:\.?\.?\/)?[^\s]+\/)?(?:bin\/)?testkit(?:\.(?:mjs|js))?\b/, "testkit")
+    .trim();
+}

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

@@ -1,30 +1,32 @@
 import fs from "fs";
 import path from "path";
-import { publicTestTypeList } from "../../domain/test-types.mjs";
+import { isAssistantRunCommand } from "./command-classifier.mjs";
 
 const POLL_INTERVAL_MS = 150;
 const OBSERVED_KINDS = new Set(["run", "discover", "status", "doctor", "typecheck"]);
-const RUN_KINDS = new Set(["run", ...publicTestTypeList({ includeAll: true, includeLegacy: true })]);
 
 export function createAssistantCommandObserver({
   productDir,
   commandLog,
+  turnId = null,
   runState,
   onEvent,
   intervalMs = POLL_INTERVAL_MS,
 } = {}) {
   const seenResultFiles = new Set();
-  const seenCommandLogEvents = new Set();
   const observedRunCommandIds = new Set();
+  const hydratedArtifactKeys = new Set();
   let timer = null;
   let running = false;
   let lastArtifactSignatures = new Map();
+  let commandLogOffset = 0;
 
   function start() {
     if (running) return;
     running = true;
+    commandLogOffset = currentCommandLogSize();
+    markExistingResultFilesSeen();
     lastArtifactSignatures = readArtifactSignatures();
-    scan();
     timer = setInterval(scan, intervalMs);
   }
 
@@ -44,18 +46,30 @@ export function createAssistantCommandObserver({
   function observeCommandLog() {
     const commandLogPath = commandLog?.commandLogPath;
     if (!commandLogPath || !fs.existsSync(commandLogPath)) return;
-    const lines = fs.readFileSync(commandLogPath, "utf8").split(/\r?\n/).filter(Boolean);
-    for (const [index, line] of lines.entries()) {
-      const eventKey = `${index}:${line}`;
-      if (seenCommandLogEvents.has(eventKey)) continue;
-      seenCommandLogEvents.add(eventKey);
+    const stat = safeStat(commandLogPath);
+    if (!stat) return;
+    if (stat.size < commandLogOffset) commandLogOffset = 0;
+    if (stat.size === commandLogOffset) return;
+    const file = fs.openSync(commandLogPath, "r");
+    let chunk = "";
+    try {
+      const length = stat.size - commandLogOffset;
+      const buffer = Buffer.alloc(length);
+      fs.readSync(file, buffer, 0, length, commandLogOffset);
+      commandLogOffset = stat.size;
+      chunk = buffer.toString("utf8");
+    } finally {
+      fs.closeSync(file);
+    }
+    const lines = chunk.split(/\r?\n/).filter(Boolean);
+    for (const line of lines) {
       let event = null;
       try {
         event = JSON.parse(line);
       } catch {
         continue;
       }
-      if (event.sessionId && commandLog.sessionId && event.sessionId !== commandLog.sessionId) continue;
+      if (!isCurrentObservation(event)) continue;
       if (event.type === "command_start" && isRunCommand(event)) {
         observedRunCommandIds.add(event.commandId);
       }
@@ -78,9 +92,12 @@ export function createAssistantCommandObserver({
       } catch {
         continue;
       }
-      if (document.sessionId && commandLog.sessionId && document.sessionId !== commandLog.sessionId) continue;
-      if (!OBSERVED_KINDS.has(document.kind)) continue;
+      if (!isCurrentObservation(document)) {
+        seenResultFiles.add(filePath);
+        continue;
+      }
       seenResultFiles.add(filePath);
+      if (!OBSERVED_KINDS.has(document.kind)) continue;
       if (document.kind === "run") {
         observedRunCommandIds.add(document.commandId);
         hydrateRunArtifact("command-result", document);
@@ -126,6 +143,9 @@ export function createAssistantCommandObserver({
   function hydrateRunArtifact(source, command = null) {
     const artifact = loadObservedRunArtifact(command);
     if (!artifact) return;
+    const key = artifactKey(source, command, artifact);
+    if (hydratedArtifactKeys.has(key)) return;
+    hydratedArtifactKeys.add(key);
     runState?.hydrateFromArtifact?.(artifact);
     onEvent?.({
       type: "observed-run-artifact",
@@ -146,15 +166,14 @@ export function createAssistantCommandObserver({
     const assistant = artifact?.provenance?.assistant || {};
     if (!assistant.sessionId || !assistant.commandId) return false;
     if (commandLog?.sessionId && assistant.sessionId !== commandLog.sessionId) return false;
+    if (turnId && assistant.turnId !== turnId) return false;
     return observedRunCommandIds.has(assistant.commandId);
   }
 
   function isRunCommand(event) {
     if (!event?.commandId) return false;
-    if (event.kind === "run") return true;
-    if (RUN_KINDS.has(event.kind)) return true;
     const argv = Array.isArray(event.argv) ? event.argv : [];
-    return argv[0] === "run" || RUN_KINDS.has(argv[0]);
+    return isAssistantRunCommand(event.kind, argv);
   }
 
   function readJsonFile(filePath) {
@@ -165,6 +184,29 @@ export function createAssistantCommandObserver({
     }
   }
 
+  function isCurrentObservation(entry) {
+    if (entry?.sessionId && commandLog?.sessionId && entry.sessionId !== commandLog.sessionId) return false;
+    if (turnId && entry?.turnId !== turnId) return false;
+    return true;
+  }
+
+  function markExistingResultFilesSeen() {
+    const resultDir = commandLog?.resultDir;
+    if (!resultDir || !fs.existsSync(resultDir)) return;
+    for (const entry of fs.readdirSync(resultDir, { withFileTypes: true })) {
+      if (entry.isFile() && entry.name.endsWith(".json")) {
+        seenResultFiles.add(path.join(resultDir, entry.name));
+      }
+    }
+  }
+
+  function currentCommandLogSize() {
+    const commandLogPath = commandLog?.commandLogPath;
+    if (!commandLogPath) return 0;
+    const stat = safeStat(commandLogPath);
+    return stat?.size || 0;
+  }
+
   function safeStat(filePath) {
     try {
       return fs.statSync(filePath);
@@ -173,6 +215,18 @@ export function createAssistantCommandObserver({
     }
   }
 
+  function artifactKey(source, command, artifact) {
+    const assistant = artifact?.provenance?.assistant || {};
+    const runId = artifact?.run?.id || command?.result?.runArtifact?.run?.id || command?.artifact?.run?.id || "unknown-run";
+    return [
+      source,
+      assistant.sessionId || commandLog?.sessionId || "",
+      assistant.turnId || turnId || "",
+      assistant.commandId || command?.commandId || "",
+      runId,
+    ].join("|");
+  }
+
   return {
     start,
     stop,

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

@@ -1,26 +1,14 @@
 import fs from "fs";
 import path from "path";
-import { publicTestTypeList } from "../../domain/test-types.mjs";
+import { classifyAssistantCommandKind } from "./command-classifier.mjs";
 
 export const ASSISTANT_SESSION_ENV = "TESTKIT_ASSISTANT_SESSION_ID";
 export const ASSISTANT_RESULT_DIR_ENV = "TESTKIT_ASSISTANT_RESULT_DIR";
 export const ASSISTANT_COMMAND_LOG_ENV = "TESTKIT_ASSISTANT_COMMAND_LOG";
 export const ASSISTANT_COMMAND_ID_ENV = "TESTKIT_ASSISTANT_COMMAND_ID";
+export const ASSISTANT_TURN_ENV = "TESTKIT_ASSISTANT_TURN_ID";
 export const ASSISTANT_WRAPPER_LOGGED_ENV = "TESTKIT_ASSISTANT_WRAPPER_LOGGED";
 
-const RUN_SHORTCUTS = new Set(publicTestTypeList({ includeAll: true, includeLegacy: true }));
-const FLAGS_WITH_VALUES = new Set([
-  "--dir",
-  "--service",
-  "--type",
-  "--suite",
-  "--file",
-  "--workers",
-  "--file-timeout-seconds",
-  "--seed",
-  "--output-mode",
-]);
-
 export function createAssistantCommandContext({
   kind,
   argv = process.argv.slice(2),
@@ -28,6 +16,7 @@ export function createAssistantCommandContext({
   env = process.env,
 } = {}) {
   const sessionId = env[ASSISTANT_SESSION_ENV] || null;
+  const turnId = env[ASSISTANT_TURN_ENV] || null;
   const resultDir = env[ASSISTANT_RESULT_DIR_ENV] || null;
   const commandLogPath = env[ASSISTANT_COMMAND_LOG_ENV] || null;
   if (!sessionId && !resultDir && !commandLogPath) return null;
@@ -36,10 +25,11 @@ export function createAssistantCommandContext({
   const startedAt = new Date().toISOString();
   return {
     sessionId,
+    turnId,
     resultDir,
     commandLogPath,
     commandId,
-    kind: kind || inferCommandKind(argv),
+    kind: kind || classifyAssistantCommandKind(argv),
     argv: Array.isArray(argv) ? argv.map(String) : [],
     cwd,
     startedAt,
@@ -116,6 +106,7 @@ export function writeAssistantCommandResult(context, payload = {}) {
       schemaVersion: 1,
       source: "testkit-command-result",
       sessionId: context.sessionId,
+      turnId: context.turnId,
       commandId: context.commandId,
       kind: context.kind,
       argv: context.argv,
@@ -141,7 +132,12 @@ export function appendAssistantCommandLog(context, event) {
     fs.mkdirSync(path.dirname(commandLogPath), { recursive: true });
     fs.appendFileSync(
       commandLogPath,
-      `${JSON.stringify({ timestamp: new Date().toISOString(), sessionId: context?.sessionId || null, ...event })}\n`,
+      `${JSON.stringify({
+        timestamp: new Date().toISOString(),
+        sessionId: context?.sessionId || null,
+        turnId: context?.turnId || null,
+        ...event,
+      })}\n`,
       "utf8"
     );
   } catch {
@@ -149,25 +145,6 @@ export function appendAssistantCommandLog(context, event) {
   }
 }
 
-function inferCommandKind(argv) {
-  const first = findFirstPositional(argv);
-  if (!first || RUN_SHORTCUTS.has(first)) return "run";
-  return first;
-}
-
-function findFirstPositional(argv) {
-  const args = Array.isArray(argv) ? argv : [];
-  for (let index = 0; index < args.length; index += 1) {
-    const arg = String(args[index]);
-    if (FLAGS_WITH_VALUES.has(arg)) {
-      index += 1;
-      continue;
-    }
-    if (!arg.startsWith("-")) return arg;
-  }
-  return null;
-}
-
 function inferExitCode(result) {
   if (Number.isInteger(result?.exitCode)) return result.exitCode;
   if (result?.ok === false) return 1;