@elench/testkit 0.1.106 → 0.1.107

package/lib/cli/assistant/interactive.mjs

@@ -43,6 +43,8 @@ export async function runInteractiveAssistant({
     assistantState.revealService(service);
   }
 
+  clearInteractiveScreen({ stdout, env });
+
   const app = render(
     createElement(AssistantApp, {
       assistantState,
@@ -59,3 +61,9 @@ export async function runInteractiveAssistant({
 
   return app.waitUntilExit();
 }
+
+export function clearInteractiveScreen({ stdout = process.stdout, env = process.env } = {}) {
+  if (env.TESTKIT_ASSISTANT_CLEAR_SCREEN === "0") return;
+  if (!stdout?.isTTY) return;
+  stdout.write("\x1b[2J\x1b[H");
+}

package/lib/cli/assistant/state.mjs

@@ -8,6 +8,10 @@ import {
 } from "../config.mjs";
 import { createRunState } from "../state/run/state.mjs";
 import { buildContextSelection } from "../../results/context.mjs";
+import { renderDiscoverResult } from "../renderers/discover/text.mjs";
+import { renderDoctorResult } from "../renderers/doctor/text.mjs";
+import { renderStatusResult } from "../renderers/status/text.mjs";
+import { renderTypecheckResult } from "../renderers/typecheck/text.mjs";
 import { isProviderInstalled } from "./providers/index.mjs";
 import { parseSlashCommand, formatSlashHelpLines } from "./slash-commands.mjs";
 import { executeAssistantAction } from "./actions.mjs";
@@ -627,7 +631,12 @@ function handleAssistantToolEvent(state, event, appendMessage) {
       toolName: event.command?.kind || "testkit",
       title: formatObservedCommandTitle(event.command),
       text: formatObservedCommandText(event.command),
-      data: event.command || null,
+      data: {
+        ...(event.command || {}),
+        command: formatObservedCommandLine(event.command),
+        exitCode: event.command?.exitCode ?? null,
+        testkitRelated: true,
+      },
     });
   }
 }
@@ -893,11 +902,18 @@ function formatObservedCommandTitle(command) {
   return `testkit ${kind}`;
 }
 
+function formatObservedCommandLine(command) {
+  if (!command) return "testkit";
+  const argv = Array.isArray(command.argv) ? command.argv : [];
+  return `testkit ${argv.join(" ") || command.kind || ""}`.trim();
+}
+
 function formatObservedCommandText(command) {
   if (!command) return "Observed Testkit command.";
+  const rendered = renderObservedCommandResult(command);
+  if (rendered.length > 0) return rendered.join("\n");
+
   const lines = [];
-  lines.push(`$ testkit ${command.argv?.join(" ") || command.kind || ""}`.trim());
-  if (Number.isInteger(command.exitCode)) lines.push(`exit code: ${command.exitCode}`);
   if (command.kind === "run" && command.result?.runArtifact) {
     for (const file of collectRunArtifactFiles(command.result.runArtifact)) {
       lines.push(`${formatObservedFileStatus(file.status)} ${file.serviceName} ${file.type} ${file.path}`);
@@ -913,6 +929,23 @@ function formatObservedCommandText(command) {
   return lines.join("\n");
 }
 
+function renderObservedCommandResult(command) {
+  const result = command?.result;
+  if (!result) return [];
+  if (command.kind === "discover") return normalizeRenderedLines(renderDiscoverResult(result, { outputMode: "compact" }));
+  if (command.kind === "status") {
+    return normalizeRenderedLines((result.results || []).flatMap((entry) => renderStatusResult(entry)));
+  }
+  if (command.kind === "doctor") return normalizeRenderedLines(renderDoctorResult(result));
+  if (command.kind === "typecheck") return normalizeRenderedLines(renderTypecheckResult(result));
+  return [];
+}
+
+function normalizeRenderedLines(lines) {
+  return (Array.isArray(lines) ? lines : [])
+    .flatMap((line) => String(line ?? "").replace(/\r/g, "").split("\n"));
+}
+
 function collectRunArtifactFiles(artifact) {
   const files = [];
   for (const service of artifact?.services || []) {

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

@@ -4,6 +4,7 @@ import { formatContextRemaining } from "./context-window.mjs";
 const PROVIDER_COMMAND_OUTPUT_PREVIEW_LINES = 12;
 const PROVIDER_FILE_READ_OUTPUT_PREVIEW_LINES = 8;
 const PROVIDER_DIFF_PREVIEW_LINES = 80;
+const TESTKIT_COMMAND_OUTPUT_PREVIEW_LINES = 18;
 
 export function buildAssistantViewModel(snapshot, { cwd = process.cwd(), terminalWidth = 100 } = {}) {
   const providerLabel = buildProviderLabel(snapshot);
@@ -57,6 +58,7 @@ export function buildTranscriptBlocks(messages) {
   return (messages || []).map((message) => {
     const role = message.role || "system";
     if (role === "tool") {
+      const outputPreview = summarizeOutput(message.text || "", TESTKIT_COMMAND_OUTPUT_PREVIEW_LINES);
       return {
         id: message.id,
         kind: classifyToolBlock(message),
@@ -67,6 +69,9 @@ export function buildTranscriptBlocks(messages) {
         status: message.status || null,
         command: message.data?.command || null,
         exitCode: message.data?.exitCode ?? null,
+        outputPreview,
+        outputLineCount: countLines(message.text || ""),
+        omittedOutputLineCount: outputPreview.omittedLineCount,
       };
     }
     if (role === "provider-tool") {
@@ -159,7 +164,7 @@ function buildProviderCommandModel(message) {
   const output = event.output || event.data?.aggregated_output || event.data?.output || "";
   const exitCode = event.data?.exit_code ?? event.data?.exitCode ?? null;
   const status = message.status || providerCommandStatus(event);
-  const diffText = extractProviderDiffText(event);
+  const diffText = extractProviderDiffText(event, rawCommand);
   const diffPreview = diffText ? summarizeOutput(diffText, PROVIDER_DIFF_PREVIEW_LINES) : null;
   const outputPreview = summarizeOutput(output, providerOutputPreviewLineLimit(event, rawCommand));
   return {
@@ -188,7 +193,7 @@ function isProviderFileReadCommand(event, rawCommand) {
   if (event.name && event.name !== "command") {
     return /^(read|view|cat)$/i.test(String(event.name));
   }
-  const command = String(rawCommand || "").trim();
+  const command = unwrapShellCommand(rawCommand);
   if (!command) return false;
   if (/^(cat|sed|awk|head|tail|nl|less|more)\b/.test(command)) return true;
   if (/\b(rg|grep)\b[\s\S]*\b--files\b/.test(command)) return false;
@@ -205,24 +210,61 @@ function summarizeProviderEditCommand(event, rawCommand) {
   return command;
 }
 
-function extractProviderDiffText(event) {
-  const candidates = [
+function extractProviderDiffText(event, rawCommand) {
+  const candidates = providerDiffCandidates(event, rawCommand);
+  for (const candidate of candidates) {
+    const text = stringifyMaybe(candidate);
+    if (looksLikeDiff(text)) return text;
+  }
+  return null;
+}
+
+function providerDiffCandidates(event, rawCommand) {
+  const name = String(event.name || "");
+  if (name && name !== "command") {
+    return [
+      event.input,
+      event.detail,
+      event.text,
+      event.output,
+      event.data?.arguments,
+      event.data?.input,
+      event.data?.patch,
+      event.data?.diff,
+      event.data?.aggregated_output,
+      event.data?.output,
+    ];
+  }
+
+  const command = String(rawCommand || event.data?.command || event.data?.input || "").trim();
+  const inputCandidates = [
     event.input,
-    event.detail,
-    event.text,
-    event.output,
     event.data?.arguments,
     event.data?.input,
     event.data?.patch,
     event.data?.diff,
-    event.data?.aggregated_output,
-    event.data?.output,
   ];
-  for (const candidate of candidates) {
-    const text = stringifyMaybe(candidate);
-    if (looksLikeDiff(text)) return text;
+  if (isDiffProducingShellCommand(command)) {
+    return [
+      ...inputCandidates,
+      event.output,
+      event.data?.aggregated_output,
+      event.data?.output,
+    ];
   }
-  return null;
+  return inputCandidates;
+}
+
+function isDiffProducingShellCommand(command) {
+  const normalized = unwrapShellCommand(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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit",
-  "version": "0.1.106",
+  "version": "0.1.107",
   "description": "Assistant-first CLI for running, inspecting, and debugging local testkit suites",
   "type": "module",
   "workspaces": [