@elench/testkit 0.1.97 → 0.1.98

package/lib/app/browser-bridge.mjs

@@ -1,6 +1,6 @@
 import { loadConfigContext, resolveProductDir } from "../config/index.mjs";
 import { discoverTests } from "../discovery/index.mjs";
-import { loadCurrentRunArtifact } from "../cli/viewer.mjs";
+import { loadCurrentRunArtifact } from "../results/artifacts.mjs";
 
 export async function loadBrowserBridgeContext(options = {}) {
   const productDir = resolveProductDir(process.cwd(), options.dir);

package/lib/cli/assistant/app.mjs

@@ -1,6 +1,7 @@
 import React, { createElement, useEffect, useMemo, useRef, useState } from "react";
 import { Box, Text, useApp, useBoxMetrics, useCursor, useInput, useStdout } from "ink";
-import { bold, cyan, dim, green, red, yellow } from "../presentation/colors.mjs";
+import { bold, cyan, dim, green, red, yellow } from "../terminal/colors.mjs";
+import { RunTreeView } from "../components/blocks/run-tree.mjs";
 import { getComposerDisplayModel } from "./composer.mjs";
 import { buildAssistantViewModel } from "./view-model.mjs";
 
@@ -49,6 +50,7 @@ export function AssistantApp({
     }),
     [snapshot, stdout?.columns]
   );
+  const runSession = assistantState.getLiveRunSession?.() || assistantState.getLastRunSession?.() || null;
 
   return createElement(
     Box,
@@ -63,6 +65,28 @@ export function AssistantApp({
     view.blocks.length === 0
       ? createElement(WelcomePanel, { view })
       : createElement(Transcript, { view }),
+    runSession
+      ? createElement(
+          Box,
+          { flexDirection: "column", marginTop: 1 },
+          createElement(Text, null, bold("Run Session")),
+          createElement(
+            Box,
+            {
+              borderStyle: "round",
+              flexDirection: "column",
+              paddingLeft: 1,
+              paddingRight: 1,
+            },
+            createElement(RunTreeView, {
+              runState: runSession.runState,
+              stdout,
+              productDir: runSession.productDir,
+              interactive: false,
+            })
+          )
+        )
+      : null,
     createElement(Text, null, ""),
     createElement(ComposerBar, { view, busy: snapshot.busy }),
     createElement(Text, null, dim(view.statusLine)),

package/lib/cli/assistant/composer.mjs

@@ -1,4 +1,4 @@
-import { measureWidth } from "../presentation/terminal-layout.mjs";
+import { measureWidth } from "../terminal/layout.mjs";
 
 const segmenter =
   typeof Intl !== "undefined" && typeof Intl.Segmenter === "function"

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

@@ -1,11 +1,11 @@
 import fs from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
-import { readContextContent, buildContextSelection } from "../context-resources.mjs";
+import { readContextContent, buildContextSelection } from "../../results/context.mjs";
 
 export function prepareAssistantContextPack({
   productDir,
-  inspectState,
+  runState,
 } = {}) {
   const contextDir = path.join(productDir, ".testkit", "assistant");
   const binDir = path.join(contextDir, "bin");
@@ -23,7 +23,7 @@ export function prepareAssistantContextPack({
   const wrapperPath = path.join(binDir, "testkit");
 
   function refresh() {
-    const snapshot = inspectState?.getSnapshot?.() || {};
+    const snapshot = runState?.getSnapshot?.() || {};
     const detailContent = readContextContent({ productDir, snapshot, mode: "detail", logTail: 12 });
     const logsContent = readContextContent({ productDir, snapshot, mode: "logs", logTail: 12 });
     const artifactsContent = readContextContent({ productDir, snapshot, mode: "artifacts", logTail: 12 });
@@ -160,7 +160,7 @@ function buildContextMarkdown(productDir, snapshot, paths) {
   lines.push(
     "",
     "## Guidance",
-    "- Use shell commands like `npm run testkit`, `npx testkit`, or `testkit run <type> --dir .` when you need to execute tests.",
+    "- Use dedicated testkit tools for run/discover/status/doctor/typecheck actions before falling back to generic shell commands.",
     "- 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.",

package/lib/cli/assistant/interactive.mjs

@@ -2,7 +2,7 @@ import React, { createElement } from "react";
 import { render } from "ink";
 import { createAssistantState } from "./state.mjs";
 import { AssistantApp } from "./app.mjs";
-import { loadLatestRunArtifact, resolveFileSubject } from "../viewer.mjs";
+import { loadLatestRunArtifact, resolveFileSubject } from "../../results/artifacts.mjs";
 
 export async function runInteractiveAssistant({
   productDir,

package/lib/cli/assistant/prompt-builder.mjs

@@ -1,4 +1,4 @@
-import { readContextContent } from "../context-resources.mjs";
+import { readContextContent } from "../../results/context.mjs";
 import { buildAssistantResponseContract } from "./protocol.mjs";
 
 export function buildAssistantPrompt({
@@ -16,7 +16,7 @@ export function buildAssistantPrompt({
     "You are Testkit Assistant.",
     "You help users run tests, inspect failures, read logs and artifacts, and navigate the current local test state.",
     "All user natural-language requests must be handled through your own reasoning plus the available tools.",
-    "Prefer real repository commands through shell_exec when the user asks to run tests or inspect the working repo.",
+    "Use the dedicated testkit tools for run/discover/status/doctor/typecheck actions; use shell_exec only for arbitrary repository commands outside those actions.",
     "Use read_context before repeating artifact/log inspection work, and use read_file/search_repo when you need codebase context.",
     buildAssistantResponseContract({ tools }),
     "",

package/lib/cli/{agents → assistant/providers}/index.mjs

@@ -1,7 +1,7 @@
 import fs from "fs";
 import path from "path";
-import { startClaudeHostedSession } from "./providers/claude.mjs";
-import { startCodexHostedSession } from "./providers/codex.mjs";
+import { startClaudeHostedSession } from "./claude.mjs";
+import { startCodexHostedSession } from "./codex.mjs";
 
 const PROVIDERS = ["codex", "claude"];
 
@@ -55,7 +55,7 @@ export function isProviderInstalled(provider, env = process.env) {
   return false;
 }
 
-export function startAgentSession({
+export function startProviderSession({
   provider = "auto",
   model = null,
   effort = null,

package/lib/cli/assistant/session.mjs

@@ -1,11 +1,11 @@
-import { startAgentSession, resolvePreferredProvider } from "../agents/index.mjs";
+import { startProviderSession, resolvePreferredProvider } from "./providers/index.mjs";
 import { buildAssistantPrompt } from "./prompt-builder.mjs";
 import { listAssistantTools, executeAssistantTool } from "./tool-registry.mjs";
 import { parseAssistantEnvelope } from "./protocol.mjs";
 
 export async function runAssistantConversationTurn({
   productDir,
-  inspectState,
+  runState,
   transcript,
   userMessage,
   provider = "auto",
@@ -21,7 +21,7 @@ export async function runAssistantConversationTurn({
   const tools = listAssistantTools();
   const toolContext = {
     productDir,
-    inspectState,
+    runState,
     configs,
     env,
     commandLog,
@@ -32,7 +32,7 @@ export async function runAssistantConversationTurn({
   const emitted = [];
 
   for (let attempt = 0; attempt < 6; attempt += 1) {
-    const snapshot = inspectState.getSnapshot();
+    const snapshot = runState.getSnapshot();
     const prompt = buildAssistantPrompt({
       productDir,
       snapshot,
@@ -52,7 +52,7 @@ export async function runAssistantConversationTurn({
     });
     onStatus?.(`Thinking with ${resolvedProvider}...`);
     const events = [];
-    const session = startAgentSession({
+    const session = startProviderSession({
       provider: runtimeSettings.provider || provider,
       model: runtimeSettings.model || null,
       effort: runtimeSettings.effort || null,

package/lib/cli/assistant/slash-commands.mjs

@@ -1,6 +1,6 @@
-const RUN_TYPES = new Set(["int", "e2e", "scenario", "dal", "load", "pw", "all"]);
 import { ASSISTANT_EFFORTS, ASSISTANT_PROVIDERS } from "./settings.mjs";
 
+const RUN_TYPES = new Set(["int", "e2e", "scenario", "dal", "load", "pw", "all"]);
 const PROVIDERS = new Set(ASSISTANT_PROVIDERS);
 const EFFORTS = new Set(ASSISTANT_EFFORTS);
 
@@ -62,6 +62,17 @@ export function parseSlashCommand(input) {
     throw new Error('/settings expects "show" or "reset"');
   }
 
+  if (command === "config") {
+    const action = tokens[0] || "show";
+    if (action === "show") return { type: "config-show" };
+    if (action === "reset") return { type: "config-reset" };
+    if (action === "auto-collapse-passed" || action === "autoCollapsePassedTreeBranches") {
+      const value = parseBooleanToken(tokens[1], "/config auto-collapse-passed");
+      return { type: "config-set-auto-collapse", value };
+    }
+    throw new Error('/config expects "show", "reset", or "auto-collapse-passed <on|off>"');
+  }
+
   if (command === "file" || command === "focus") {
     if (!tokens[0]) throw new Error(`/${command} expects a file path`);
     return { type: "file", file: tokens.join(" ") };
@@ -134,11 +145,21 @@ export function formatSlashHelpLines() {
     "/provider-arg clear",
     "/settings",
     "/settings reset",
+    "/config",
+    "/config auto-collapse-passed <on|off>",
+    "/config reset",
     "/clear",
     "/quit",
   ];
 }
 
+function parseBooleanToken(value, commandName) {
+  const normalized = String(value || "").trim().toLowerCase();
+  if (["on", "true", "yes", "1"].includes(normalized)) return true;
+  if (["off", "false", "no", "0"].includes(normalized)) return false;
+  throw new Error(`${commandName} expects on or off`);
+}
+
 function parseRunCommandTokens(tokens) {
   const options = {
     type: [],

package/lib/cli/assistant/state.mjs

@@ -1,7 +1,14 @@
-import { loadCurrentRunArtifact, loadLatestRunArtifact } from "../viewer.mjs";
-import { createInspectState } from "../tui/inspect-state.mjs";
-import { buildContextSelection } from "../context-resources.mjs";
-import { isProviderInstalled } from "../agents/index.mjs";
+import { loadCurrentRunArtifact, loadLatestRunArtifact } from "../../results/artifacts.mjs";
+import {
+  formatCliConfig,
+  loadCliConfig,
+  mergeCliConfig,
+  resetCliConfig,
+  saveCliConfig,
+} from "../config.mjs";
+import { createRunState } from "../state/run/state.mjs";
+import { buildContextSelection } from "../../results/context.mjs";
+import { isProviderInstalled } from "./providers/index.mjs";
 import { parseSlashCommand, formatSlashHelpLines } from "./slash-commands.mjs";
 import { executeAssistantTool } from "./tool-registry.mjs";
 import { runAssistantConversationTurn } from "./session.mjs";
@@ -41,10 +48,12 @@ export function createAssistantState({
   configs = [],
   env = process.env,
 } = {}) {
-  const inspectState = createInspectState({ dataSource });
+  const runState = createRunState({ dataSource });
+  let cliConfig = loadCliConfig(productDir);
+  runState.setAutoCollapsePassedTreeBranches(cliConfig.autoCollapsePassedTreeBranches);
   const commandLog = prepareAssistantContextPack({
     productDir,
-    inspectState,
+    runState,
   });
 
   const listeners = new Set();
@@ -76,8 +85,11 @@ export function createAssistantState({
     model: settings.model,
     prompt: "",
   });
+  let liveRunSession = null;
+  let lastRunSession = null;
+  let liveRunSessionUnsubscribe = null;
 
-  inspectState.subscribe(() => {
+  runState.subscribe(() => {
     commandLog.refresh();
     notify();
   });
@@ -104,13 +116,46 @@ export function createAssistantState({
     commandLog.refresh();
   }
 
+  function attachRunSession(session, { active = true } = {}) {
+    if (liveRunSessionUnsubscribe) {
+      liveRunSessionUnsubscribe();
+      liveRunSessionUnsubscribe = null;
+    }
+    if (!session) {
+      if (!active) notify();
+      return;
+    }
+    lastRunSession = session;
+    if (active) {
+      liveRunSession = session;
+      liveRunSessionUnsubscribe = session.runState.subscribe(() => {
+        notify();
+      });
+    }
+    notify();
+  }
+
+  function completeRunSession(session) {
+    if (liveRunSession === session) {
+      if (liveRunSessionUnsubscribe) {
+        liveRunSessionUnsubscribe();
+        liveRunSessionUnsubscribe = null;
+      }
+      liveRunSession = null;
+    }
+    if (session) lastRunSession = session;
+    notify();
+  }
+
   const state = {
-    inspectState,
+    runState,
     commandLog,
+    attachRunSession,
+    completeRunSession,
 
     async loadLatestArtifact() {
       try {
-        inspectState.hydrateFromArtifact(loadLatestRunArtifact(productDir));
+        runState.hydrateFromArtifact(loadLatestRunArtifact(productDir));
       } catch {
         // No artifact yet.
       }
@@ -119,7 +164,7 @@ export function createAssistantState({
 
     async loadCurrentArtifact() {
       try {
-        inspectState.hydrateFromArtifact(loadCurrentRunArtifact(productDir));
+        runState.hydrateFromArtifact(loadCurrentRunArtifact(productDir));
       } catch {
         // No artifact yet.
       }
@@ -127,13 +172,13 @@ export function createAssistantState({
     },
 
     revealFile(serviceName, filePath) {
-      const revealed = inspectState.revealFile(serviceName, filePath);
+      const revealed = runState.revealFile(serviceName, filePath);
       refreshContextPack();
       return revealed;
     },
 
     revealService(serviceName) {
-      const revealed = inspectState.revealService(serviceName);
+      const revealed = runState.revealService(serviceName);
       refreshContextPack();
       return revealed;
     },
@@ -228,6 +273,19 @@ export function createAssistantState({
       notify();
     },
 
+    setCliConfig(nextConfig) {
+      cliConfig = mergeCliConfig(cliConfig, nextConfig);
+      saveCliConfig(productDir, cliConfig);
+      runState.setAutoCollapsePassedTreeBranches(cliConfig.autoCollapsePassedTreeBranches);
+      notify();
+    },
+
+    resetCliConfig() {
+      cliConfig = resetCliConfig(productDir);
+      runState.setAutoCollapsePassedTreeBranches(cliConfig.autoCollapsePassedTreeBranches);
+      notify();
+    },
+
     resetSettings() {
       settings = resetAssistantSettings(productDir);
       resolvedProviderName = null;
@@ -239,6 +297,14 @@ export function createAssistantState({
       notify();
     },
 
+    getLiveRunSession() {
+      return liveRunSession;
+    },
+
+    getLastRunSession() {
+      return lastRunSession;
+    },
+
     async submitCurrentComposer() {
       const value = composerState.text.trim();
       composerState = createComposerState();
@@ -263,6 +329,7 @@ export function createAssistantState({
       }
       if (slash) {
         try {
+          setBusy(true, `Running ${slash.type}...`);
           await executeSlashCommand({
             slash,
             state,
@@ -277,6 +344,8 @@ export function createAssistantState({
             role: "system",
             text: error instanceof Error ? error.message : String(error),
           });
+        } finally {
+          setBusy(false, null);
         }
         refreshContextPack();
         notify();
@@ -286,6 +355,7 @@ export function createAssistantState({
       const routedSlash = routeLocalIntent(trimmed);
       if (routedSlash) {
         try {
+          setBusy(true, `Running ${routedSlash.type}...`);
           await executeSlashCommand({
             slash: routedSlash,
             state,
@@ -300,6 +370,8 @@ export function createAssistantState({
             role: "system",
             text: error instanceof Error ? error.message : String(error),
           });
+        } finally {
+          setBusy(false, null);
         }
         refreshContextPack();
         notify();
@@ -310,7 +382,7 @@ export function createAssistantState({
         setBusy(true, `Thinking with ${settings.provider === "auto" ? "provider" : settings.provider}...`);
         const emitted = await runAssistantConversationTurn({
           productDir,
-          inspectState,
+          runState,
           transcript: messages.map((entry) => ({ role: entry.role, text: entry.text })),
           userMessage: trimmed,
           settings,
@@ -334,7 +406,7 @@ export function createAssistantState({
             notify();
           },
           onToolEvent(event) {
-            handleAssistantToolEvent(event, appendMessage);
+            handleAssistantToolEvent(state, event, appendMessage);
           },
         });
         for (const message of emitted) appendMessage(message);
@@ -356,8 +428,8 @@ export function createAssistantState({
 
     getSnapshot() {
       return {
-        context: buildContextSelection(inspectState.getSnapshot()),
-        inspect: inspectState.getSnapshot(),
+        context: buildContextSelection(runState.getSnapshot()),
+        run: runState.getSnapshot(),
         productDir,
         messages: [...messages],
         composer: composerState.text,
@@ -369,8 +441,11 @@ export function createAssistantState({
         model: settings.model,
         effort: settings.effort,
         providerArgs: [...settings.providerArgs],
+        cliConfig,
         activeStatus,
         contextUsage,
+        liveRunSession: serializeRunSession(liveRunSession),
+        lastRunSession: serializeRunSession(lastRunSession),
         contextPaths: {
           contextPath: commandLog.contextPath,
           summaryPath: commandLog.summaryPath,
@@ -460,28 +535,32 @@ async function executeSlashCommand({
     appendMessage({ role: "assistant", text: "Assistant settings reset." });
     return;
   }
+  if (slash.type === "config-show") {
+    appendMessage({ role: "assistant", text: formatCliConfig(state.getSnapshot().cliConfig) });
+    return;
+  }
+  if (slash.type === "config-reset") {
+    state.resetCliConfig();
+    appendMessage({ role: "assistant", text: "CLI config reset." });
+    return;
+  }
+  if (slash.type === "config-set-auto-collapse") {
+    state.setCliConfig({ autoCollapsePassedTreeBranches: slash.value });
+    appendMessage({
+      role: "assistant",
+      text: `autoCollapsePassedTreeBranches set to ${slash.value}.`,
+    });
+    return;
+  }
 
   const result = await executeSlashTool(slash, {
     productDir,
-    inspectState: state.inspectState,
+    runState: state.runState,
     configs,
     env,
     commandLog: state.commandLog,
     onEvent(event) {
-      if (event.type === "tool-start") {
-        appendMessage({
-          role: "tool",
-          status: "running",
-          title: event.title || event.tool || "Tool",
-          text: event.message,
-          data: {
-            command: event.command || null,
-            testkitRelated: Boolean(event.testkitRelated),
-          },
-        });
-      } else if (event.type === "tool-status") {
-        state.setNotice(event.message);
-      }
+      handleAssistantToolEvent(state, event, appendMessage);
     },
     provider: settings.provider,
   });
@@ -494,18 +573,32 @@ async function executeSlashCommand({
   });
 }
 
-function handleAssistantToolEvent(event, appendMessage) {
-  if (!event || event.type !== "tool-start") return;
-  appendMessage({
-    role: "tool",
-    status: "running",
-    title: event.title || event.tool || "Tool",
-    text: event.message || "Running tool",
-    data: {
-      command: event.command || null,
-      testkitRelated: Boolean(event.testkitRelated),
-    },
-  });
+function handleAssistantToolEvent(state, event, appendMessage) {
+  if (!event) return;
+  if (event.type === "tool-start") {
+    appendMessage({
+      role: "tool",
+      status: "running",
+      title: event.title || event.tool || "Tool",
+      text: event.message || "Running tool",
+      data: {
+        command: event.command || null,
+        testkitRelated: Boolean(event.testkitRelated),
+      },
+    });
+    return;
+  }
+  if (event.type === "tool-status") {
+    state.setNotice(event.message);
+    return;
+  }
+  if (event.type === "run-session-start") {
+    state.attachRunSession(event.session, { active: true });
+    return;
+  }
+  if (event.type === "run-session-end") {
+    state.completeRunSession(event.session);
+  }
 }
 
 function formatSettings(snapshot) {
@@ -538,46 +631,18 @@ async function executeSlashTool(slash, context) {
     case "service":
       return executeAssistantTool("read_context", { service: slash.service, mode: "detail" }, context);
     case "status":
-      return executeAssistantTool("shell_exec", { command: "testkit status --dir ." }, context);
+      return executeAssistantTool("show_status", {}, context);
     case "discover":
-      return executeAssistantTool("shell_exec", { command: "testkit discover --dir ." }, context);
+      return executeAssistantTool("discover_tests", {}, context);
     case "doctor":
-      return executeAssistantTool("shell_exec", { command: "testkit doctor --dir ." }, context);
+      return executeAssistantTool("run_doctor", {}, context);
     case "run":
-      return executeAssistantTool("shell_exec", { command: buildRunSlashCommand(slash.options) }, context);
+      return executeAssistantTool("run_tests", slash.options, context);
     default:
       throw new Error(`Unsupported slash command "${slash.type}"`);
   }
 }
 
-function buildRunSlashCommand(options = {}) {
-  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);
-  }
-  for (const file of options.file || []) {
-    parts.push("--file", file);
-  }
-  if (options.service) parts.push("--service", options.service);
-  return parts.map(shellEscapeArg).join(" ");
-}
-
-function shellEscapeArg(value) {
-  const stringValue = String(value);
-  if (/^[a-zA-Z0-9._:/-]+$/.test(stringValue)) return stringValue;
-  return `'${stringValue.replace(/'/g, `'\\''`)}'`;
-}
-
 function parseSlashCommandSafe(input) {
   try {
     return parseSlashCommand(input);
@@ -619,3 +684,11 @@ function routeLocalIntent(input) {
   if (/^list\s+test\s+files$/.test(normalized)) return { type: "discover" };
   return null;
 }
+
+function serializeRunSession(session) {
+  if (!session) return null;
+  return {
+    productDir: session.productDir,
+    snapshot: session.getSnapshot(),
+  };
+}