@elench/testkit 0.1.105 → 0.1.107

package/lib/cli/assistant/app.mjs

@@ -6,6 +6,10 @@ import { CodeBlock } from "./code-block.mjs";
 import { getComposerDisplayModel } from "./composer.mjs";
 import { MarkdownBlock } from "./markdown-block.mjs";
 import { buildAssistantViewModel } from "./view-model.mjs";
+import { truncateText, wrapText } from "../terminal/layout.mjs";
+
+const FALLBACK_COMMAND_BLOCK_WIDTH = 100;
+const COMMAND_BLOCK_CHROME_WIDTH = 4;
 
 export function AssistantApp({
   assistantState,
@@ -180,13 +184,13 @@ function Transcript({ view }) {
     createElement(Text, null, dim(view.welcome.rows.find(([label]) => label === "Provider")?.[1] || "")),
     createElement(Text, null, ""),
     view.notice ? createElement(Text, null, yellow(view.notice)) : null,
-    ...view.blocks.flatMap((block) => renderBlock(block))
+    ...view.blocks.flatMap((block) => renderBlock(block, view))
   );
 }
 
-function renderBlock(block) {
+function renderBlock(block, view) {
   if (block.format === "markdown") return renderMarkdownBlock(block);
-  if (block.format === "command") return renderCommandBlock(block);
+  if (block.format === "command") return renderCommandBlock(block, view);
   return renderPlainBlock(block);
 }
 
@@ -227,7 +231,7 @@ function renderPlainBlock(block) {
   return rendered;
 }
 
-function renderCommandBlock(block) {
+function renderCommandBlock(block, view = {}) {
   const marker = colorMarker(block);
   const title = block.title ? bold(block.title) : bold("command");
   const command = formatCommandLine(block);
@@ -237,6 +241,14 @@ function renderCommandBlock(block) {
   const omitted = codeBlock
     ? codeBlock.omittedLineCount || 0
     : 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 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;
 
   return [
     createElement(
@@ -248,18 +260,19 @@ function renderCommandBlock(block) {
         paddingLeft: 1,
         paddingRight: 1,
         marginBottom: 1,
+        width: blockWidth,
       },
       createElement(Text, { key: "title" }, `${marker} ${title}`),
-      command ? createElement(Text, { key: "command" }, `${dim("$")} ${command}`) : null,
-      status ? createElement(Text, { key: "status" }, colorCommandStatus(block, status)) : null,
+      ...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 }) : []),
-      ...outputLines.map((line, index) => (
+      ...(codeBlock ? CodeBlock({ lines: codeBlock.lines, language: codeBlock.language, width: contentWidth }) : []),
+      ...previewLines.map((line, index) => (
         createElement(Text, { key: `output-${index}` }, dim(line))
       )),
-      omitted > 0 ? createElement(Text, { key: "omitted" }, dim(`… ${omitted} more line${omitted === 1 ? "" : "s"} omitted`)) : null,
+      omittedLine ? createElement(Text, { key: "omitted" }, dim(omittedLine)) : null,
       block.text && !command && outputLines.length === 0
-        ? createElement(Text, { key: "text" }, colorBlockText(block, block.text))
+        ? createElement(Text, { key: "text" }, colorBlockText(block, truncateText(block.text, contentWidth)))
         : null
     ),
   ];

package/lib/cli/assistant/code-block.mjs

@@ -1,10 +1,11 @@
 import React, { createElement } from "react";
 import { Text } from "ink";
 import { dim, green, red, cyan } from "../terminal/colors.mjs";
+import { truncateText } from "../terminal/layout.mjs";
 
-export function CodeBlock({ lines = [], language = "text" } = {}) {
+export function CodeBlock({ lines = [], language = "text", width = null } = {}) {
   return lines.map((line, index) => (
-    createElement(Text, { key: `code-${index}` }, colorCodeLine(line, language))
+    createElement(Text, { key: `code-${index}` }, colorCodeLine(width ? truncateText(line, width) : line, language))
   ));
 }
 

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/transcript-text.mjs

@@ -1,15 +1,16 @@
 import stripAnsi from "strip-ansi";
+import { truncateText, wrapText } from "../terminal/layout.mjs";
 import { buildAssistantViewModel } from "./view-model.mjs";
 import { renderCodeBlockText } from "./code-block.mjs";
 import { renderMarkdownToAnsi } from "./markdown-block.mjs";
 
-export function renderAssistantSnapshotText(snapshot, { cwd = process.cwd(), ansi = false } = {}) {
-  const view = buildAssistantViewModel(snapshot || {}, { cwd });
+export function renderAssistantSnapshotText(snapshot, { cwd = process.cwd(), ansi = false, width = 100 } = {}) {
+  const view = buildAssistantViewModel(snapshot || {}, { cwd, terminalWidth: width });
   const lines = [view.title, view.welcome.rows.find(([label]) => label === "Provider")?.[1] || ""]
     .filter(Boolean);
   for (const block of view.blocks || []) {
     lines.push("");
-    lines.push(...renderBlockLines(block, { ansi }));
+    lines.push(...renderBlockLines(block, { ansi, width: view.terminalWidth || width }));
   }
   lines.push("");
   lines.push(view.statusLine);
@@ -17,7 +18,7 @@ export function renderAssistantSnapshotText(snapshot, { cwd = process.cwd(), ans
   return ansi ? text : stripAnsi(text);
 }
 
-function renderBlockLines(block, { ansi = false } = {}) {
+function renderBlockLines(block, { ansi = false, width = 100 } = {}) {
   const marker = block.marker || "";
   const title = block.title ? ` ${block.title}` : "";
   const text = String(block.text || "").trimEnd();
@@ -27,28 +28,29 @@ function renderBlockLines(block, { ansi = false } = {}) {
     return prefixLines(`${marker}${title}`, normalized);
   }
   if (block.format === "command") {
-    return renderCommandBlockLines(block);
+    return renderCommandBlockLines(block, { width });
   }
   return prefixLines(`${marker}${title}`, text);
 }
 
-function renderCommandBlockLines(block) {
+function renderCommandBlockLines(block, { width = 100 } = {}) {
   const header = `${block.marker || ""}${block.title ? ` ${block.title}` : ""}`.trim();
   const body = [];
+  const innerWidth = Math.max(1, width - 4);
   const command = formatCommandLine(block.command);
   const status = formatCommandStatus(block);
-  if (command) body.push(`$ ${command}`);
-  if (status) body.push(status);
+  if (command) body.push(...wrapText(`$ ${command}`, innerWidth));
+  if (status) body.push(truncateText(status, innerWidth));
   if (block.codeBlock) {
     body.push("");
-    body.push(...renderCodeBlockText(block.codeBlock));
+    body.push(...renderCodeBlockText(block.codeBlock).map((line) => truncateText(line, innerWidth)));
   } else {
-    for (const line of block.outputPreview?.lines || []) body.push(String(line));
+    for (const line of block.outputPreview?.lines || []) body.push(truncateText(line, innerWidth));
     const omitted = block.outputPreview?.omittedLineCount || block.omittedOutputLineCount || 0;
-    if (omitted > 0) body.push(`... ${omitted} more line${omitted === 1 ? "" : "s"} omitted`);
+    if (omitted > 0) body.push(truncateText(`... ${omitted} more line${omitted === 1 ? "" : "s"} omitted`, innerWidth));
   }
-  if (!command && body.length === 0 && block.text) body.push(String(block.text));
-  return boxLines([header, ...body].filter(Boolean));
+  if (!command && body.length === 0 && block.text) body.push(truncateText(block.text, innerWidth));
+  return boxLines([header, ...body].filter(Boolean), { width });
 }
 
 function formatCommandLine(command) {
@@ -70,13 +72,13 @@ function formatCommandStatus(block) {
   return null;
 }
 
-function boxLines(lines) {
-  const width = Math.max(1, ...lines.map((line) => visibleWidth(line)));
-  const top = `╭${"─".repeat(width + 2)}╮`;
-  const bottom = `╰${"─".repeat(width + 2)}╯`;
+function boxLines(lines, { width = null } = {}) {
+  const contentWidth = width ? Math.max(1, width - 4) : Math.max(1, ...lines.map((line) => visibleWidth(line)));
+  const top = `╭${"─".repeat(contentWidth + 2)}╮`;
+  const bottom = `╰${"─".repeat(contentWidth + 2)}╯`;
   return [
     top,
-    ...lines.map((line) => `│ ${line}${" ".repeat(width - visibleWidth(line))} │`),
+    ...lines.map((line) => `│ ${line}${" ".repeat(contentWidth - visibleWidth(line))} │`),
     bottom,
   ];
 }

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

@@ -2,7 +2,9 @@ import path from "path";
 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);
@@ -56,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),
@@ -66,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") {
@@ -158,9 +164,9 @@ 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, PROVIDER_COMMAND_OUTPUT_PREVIEW_LINES);
+  const outputPreview = summarizeOutput(output, providerOutputPreviewLineLimit(event, rawCommand));
   return {
     command: diffPreview ? summarizeProviderEditCommand(event, rawCommand) : rawCommand,
     exitCode,
@@ -178,6 +184,23 @@ function buildProviderCommandModel(message) {
   };
 }
 
+function providerOutputPreviewLineLimit(event, rawCommand) {
+  if (isProviderFileReadCommand(event, rawCommand)) return PROVIDER_FILE_READ_OUTPUT_PREVIEW_LINES;
+  return PROVIDER_COMMAND_OUTPUT_PREVIEW_LINES;
+}
+
+function isProviderFileReadCommand(event, rawCommand) {
+  if (event.name && event.name !== "command") {
+    return /^(read|view|cat)$/i.test(String(event.name));
+  }
+  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;
+  if (/^(rg|grep)\b/.test(command) && !/\s(-n|--line-number)\b/.test(command)) return false;
+  return /(\bsed\s+-n\b|\bhead\b|\btail\b|\bnl\b|\bcat\b)/.test(command);
+}
+
 function summarizeProviderEditCommand(event, rawCommand) {
   const name = event.name ? String(event.name) : "edit";
   if (name && name !== "command") return name;
@@ -187,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/lib/cli/terminal/layout.mjs

@@ -32,6 +32,25 @@ export function wrapText(text, width) {
   }).split("\n");
 }
 
+export function truncateText(text, width, { ellipsis = "…" } = {}) {
+  const normalized = String(text ?? "");
+  if (width <= 0) return "";
+  if (measureWidth(normalized) <= width) return normalized;
+  const ellipsisWidth = measureWidth(ellipsis);
+  if (width <= ellipsisWidth) return ellipsis.slice(0, width);
+
+  const targetWidth = width - ellipsisWidth;
+  let rendered = "";
+  let renderedWidth = 0;
+  for (const char of normalized) {
+    const charWidth = measureWidth(char);
+    if (renderedWidth + charWidth > targetWidth) break;
+    rendered += char;
+    renderedWidth += charWidth;
+  }
+  return `${rendered}${ellipsis}`;
+}
+
 export function renderIndentedBlock(text, { width, indent = "    " } = {}) {
   const visibleIndent = measureWidth(indent);
   const contentWidth = Math.max(12, width - visibleIndent);

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

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

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

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