@elench/testkit 0.1.103 → 0.1.105

package/lib/cli/assistant/app.mjs

@@ -2,6 +2,7 @@ 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 { getComposerDisplayModel } from "./composer.mjs";
 import { MarkdownBlock } from "./markdown-block.mjs";
 import { buildAssistantViewModel } from "./view-model.mjs";
@@ -185,6 +186,7 @@ function Transcript({ view }) {
 
 function renderBlock(block) {
   if (block.format === "markdown") return renderMarkdownBlock(block);
+  if (block.format === "command") return renderCommandBlock(block);
   return renderPlainBlock(block);
 }
 
@@ -225,6 +227,70 @@ function renderPlainBlock(block) {
   return rendered;
 }
 
+function renderCommandBlock(block) {
+  const marker = colorMarker(block);
+  const title = block.title ? bold(block.title) : bold("command");
+  const command = formatCommandLine(block);
+  const status = formatCommandStatus(block);
+  const codeBlock = block.codeBlock || null;
+  const outputLines = codeBlock ? [] : block.outputPreview?.lines || [];
+  const omitted = codeBlock
+    ? codeBlock.omittedLineCount || 0
+    : block.outputPreview?.omittedLineCount || block.omittedOutputLineCount || 0;
+
+  return [
+    createElement(
+      Box,
+      {
+        key: `${block.id}-command`,
+        borderStyle: "round",
+        flexDirection: "column",
+        paddingLeft: 1,
+        paddingRight: 1,
+        marginBottom: 1,
+      },
+      createElement(Text, { key: "title" }, `${marker} ${title}`),
+      command ? createElement(Text, { key: "command" }, `${dim("$")} ${command}`) : null,
+      status ? createElement(Text, { key: "status" }, colorCommandStatus(block, status)) : null,
+      codeBlock ? createElement(Text, { key: "code-gap" }, "") : null,
+      ...(codeBlock ? CodeBlock({ lines: codeBlock.lines, language: codeBlock.language }) : []),
+      ...outputLines.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,
+      block.text && !command && outputLines.length === 0
+        ? createElement(Text, { key: "text" }, colorBlockText(block, block.text))
+        : null
+    ),
+  ];
+}
+
+function formatCommandLine(block) {
+  if (!block.command) return null;
+  if (typeof block.command === "string") return block.command;
+  try {
+    return JSON.stringify(block.command);
+  } catch {
+    return String(block.command);
+  }
+}
+
+function formatCommandStatus(block) {
+  const status = block.status || null;
+  if (status === "running") return "running";
+  if (status === "error") return block.exitCode == null ? "failed" : `failed · exit code ${block.exitCode}`;
+  if (block.exitCode != null) return `completed · exit code ${block.exitCode}`;
+  if (status === "done") return "completed";
+  if (block.text && !block.command) return null;
+  return block.text || null;
+}
+
+function colorCommandStatus(block, status) {
+  if (block.status === "error") return red(status);
+  if (block.status === "running") return yellow(status);
+  return green(status);
+}
+
 function ComposerBar({ view, busy }) {
   const ref = useRef(null);
   const metrics = useBoxMetrics(ref);
@@ -283,7 +349,7 @@ function colorMarker(block) {
   if (block.kind === "system") return red(block.marker);
   if (block.kind === "provider-error") return red(block.marker);
   if (block.kind === "provider-activity") return dim(block.marker);
-  if (block.kind === "provider-tool") return yellow(block.marker);
+  if (block.kind === "provider-command") return yellow(block.marker);
   if (block.kind === "tool-running") return yellow(block.marker);
   if (block.kind === "testkit-run") return green(block.marker);
   return block.marker;
@@ -294,7 +360,7 @@ function colorBlockText(block, text) {
   if (block.kind === "system") return red(text);
   if (block.kind === "provider-error") return red(text);
   if (block.kind === "provider-activity") return dim(text);
-  if (block.kind === "provider-tool") return yellow(text);
+  if (block.kind === "provider-command") return yellow(text);
   if (block.kind === "tool-running") return yellow(text);
   return text;
 }

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

@@ -0,0 +1,29 @@
+import React, { createElement } from "react";
+import { Text } from "ink";
+import { dim, green, red, cyan } from "../terminal/colors.mjs";
+
+export function CodeBlock({ lines = [], language = "text" } = {}) {
+  return lines.map((line, index) => (
+    createElement(Text, { key: `code-${index}` }, colorCodeLine(line, language))
+  ));
+}
+
+export function renderCodeBlockText({ lines = [], omittedLineCount = 0 } = {}) {
+  const rendered = [...lines.map((line) => String(line))];
+  if (omittedLineCount > 0) {
+    rendered.push(`... ${omittedLineCount} more line${omittedLineCount === 1 ? "" : "s"} omitted`);
+  }
+  return rendered;
+}
+
+export function colorCodeLine(line, language = "text") {
+  const text = String(line ?? "");
+  if (language !== "diff") return dim(text);
+  if (/^\+\+\+/.test(text) || /^---/.test(text) || /^diff --git\b/.test(text) || /^index\b/.test(text)) {
+    return cyan(text);
+  }
+  if (/^\+/.test(text)) return green(text);
+  if (/^-/.test(text)) return red(text);
+  if (/^@@/.test(text) || /^\*\*\*/.test(text)) return cyan(text);
+  return dim(text);
+}

package/lib/cli/assistant/providers/codex.mjs

@@ -182,7 +182,9 @@ function codexItemStartedEvent(item) {
 function codexItemUpdatedEvent(item) {
   if (!item || typeof item !== "object") return null;
   if (item.type === "agent_message" && typeof item.text === "string") {
-    return providerAssistantDelta(item.text);
+    return providerAssistantDelta(item.text, {
+      id: item.id || null,
+    });
   }
   if (item.type === "command_execution") {
     return providerToolUpdate("command", {
@@ -204,7 +206,9 @@ function codexItemUpdatedEvent(item) {
 function codexItemCompletedEvent(item) {
   if (!item || typeof item !== "object") return null;
   if (item.type === "agent_message" && typeof item.text === "string") {
-    return providerAssistantFinal(item.text);
+    return providerAssistantFinal(item.text, {
+      id: item.id || null,
+    });
   }
   if (item.type === "command_execution") {
     return providerToolEnd("command", {

package/lib/cli/assistant/state.mjs

@@ -635,6 +635,8 @@ function handleAssistantToolEvent(state, event, appendMessage) {
 function createProviderTurnState() {
   return {
     assistantMessageId: null,
+    assistantMessageIdsByProviderItem: new Map(),
+    providerToolMessageIdsByProviderItem: new Map(),
     lastActivityText: null,
   };
 }
@@ -673,12 +675,7 @@ function handleProviderEvent(turn, event, { appendMessage, updateMessage, setSta
     return;
   }
   if (event.type === "tool-start" || event.type === "tool-update" || event.type === "tool-end") {
-    appendProviderActivity(turn, {
-      role: "provider-tool",
-      title: formatProviderToolTitle(event),
-      text: formatProviderToolText(event),
-      data: event,
-    }, { appendMessage, setStatus });
+    upsertProviderToolActivity(turn, event, { appendMessage, updateMessage, setStatus });
     return;
   }
   if (event.type === "error") {
@@ -693,15 +690,19 @@ function handleProviderEvent(turn, event, { appendMessage, updateMessage, setSta
 }
 
 function appendAssistantDelta(turn, event, { appendMessage, updateMessage }) {
-  if (!turn.assistantMessageId) {
-    turn.assistantMessageId = appendMessage({
+  const messageKey = providerAssistantMessageKey(event);
+  let messageId = messageKey ? turn.assistantMessageIdsByProviderItem.get(messageKey) : turn.assistantMessageId;
+  if (!messageId) {
+    messageId = appendMessage({
       role: "assistant",
       status: "streaming",
       provider: event.provider || null,
       text: "",
     });
+    if (messageKey) turn.assistantMessageIdsByProviderItem.set(messageKey, messageId);
+    else turn.assistantMessageId = messageId;
   }
-  updateMessage(turn.assistantMessageId, (message) => ({
+  updateMessage(messageId, (message) => ({
     text: `${message.text || ""}${event.text || ""}`,
     status: "streaming",
   }));
@@ -709,20 +710,87 @@ function appendAssistantDelta(turn, event, { appendMessage, updateMessage }) {
 
 function finalizeAssistantMessage(turn, event, { appendMessage, updateMessage }) {
   const finalText = event.text || "";
-  if (!turn.assistantMessageId) {
-    turn.assistantMessageId = appendMessage({
+  const messageKey = providerAssistantMessageKey(event);
+  let messageId = messageKey ? turn.assistantMessageIdsByProviderItem.get(messageKey) : turn.assistantMessageId;
+  if (!messageId) {
+    messageId = appendMessage({
       role: "assistant",
       provider: event.provider || null,
       text: finalText,
     });
+    if (messageKey) turn.assistantMessageIdsByProviderItem.set(messageKey, messageId);
+    else turn.assistantMessageId = messageId;
     return;
   }
-  updateMessage(turn.assistantMessageId, (message) => ({
+  updateMessage(messageId, (message) => ({
     text: finalText || message.text || "",
     status: null,
   }));
 }
 
+function providerAssistantMessageKey(event) {
+  if (!event?.id) return null;
+  return `${event.provider || "provider"}:${event.id}`;
+}
+
+function upsertProviderToolActivity(turn, event, { appendMessage, updateMessage, setStatus }) {
+  const messageKey = providerToolMessageKey(event);
+  const status = providerToolStatus(event);
+  const buildMessage = (data) => ({
+    role: "provider-tool",
+    title: formatProviderToolTitle(data),
+    text: formatProviderToolText(data),
+    status,
+    data,
+  });
+
+  if (!messageKey) {
+    appendProviderActivity(turn, buildMessage(event), { appendMessage, setStatus });
+    return;
+  }
+
+  const existingMessageId = turn.providerToolMessageIdsByProviderItem.get(messageKey);
+  if (!existingMessageId) {
+    const messageId = appendMessage(buildMessage(event));
+    turn.providerToolMessageIdsByProviderItem.set(messageKey, messageId);
+    setStatus?.(formatProviderToolStatusLine(event));
+    return;
+  }
+
+  updateMessage(existingMessageId, (message) => {
+    const data = mergeProviderToolEventData(message.data, event);
+    return buildMessage(data);
+  });
+  setStatus?.(formatProviderToolStatusLine(event));
+}
+
+function providerToolMessageKey(event) {
+  if (!event?.id) return null;
+  return `${event.provider || "provider"}:${event.id}`;
+}
+
+function mergeProviderToolEventData(previous, event) {
+  const merged = {
+    ...(previous || {}),
+    ...(event || {}),
+  };
+  if (previous?.input != null && event?.input == null) merged.input = previous.input;
+  if (previous?.detail != null && event?.detail == null) merged.detail = previous.detail;
+  if (previous?.output != null && event?.output == null) merged.output = previous.output;
+  if (previous?.text != null && event?.text == null) merged.text = previous.text;
+  merged.data = {
+    ...(previous?.data || {}),
+    ...(event?.data || {}),
+  };
+  return merged;
+}
+
+function providerToolStatus(event) {
+  if (event.type === "tool-start" || event.type === "tool-update") return "running";
+  if (event.status === "error") return "error";
+  return "done";
+}
+
 function appendProviderActivity(turn, message, { appendMessage, setStatus }) {
   const text = String(message.text || "").trim();
   if (!text) return;
@@ -740,21 +808,24 @@ function formatProviderName(provider) {
 function formatProviderToolTitle(event) {
   const provider = formatProviderName(event.provider);
   const name = event.name || "tool";
-  if (event.type === "tool-end") return `${provider} finished ${name}`;
-  if (event.type === "tool-update") return `${provider} updated ${name}`;
-  return `${provider} started ${name}`;
+  return `${provider} ${name}`;
 }
 
 function formatProviderToolText(event) {
   const lines = [];
   if (event.detail) lines.push(String(event.detail));
-  if (event.text) lines.push(String(event.text));
   if (event.input) lines.push(formatProviderData("input", event.input));
   if (event.output) lines.push(formatProviderData("output", event.output));
   if (event.status) lines.push(`status: ${event.status}`);
   return lines.filter(Boolean).join("\n") || event.name || "Provider tool activity";
 }
 
+function formatProviderToolStatusLine(event) {
+  const title = formatProviderToolTitle(event);
+  const status = providerToolStatus(event);
+  return `${title}: ${status}`;
+}
+
 function formatProviderData(label, value) {
   if (value == null) return null;
   if (typeof value === "string") return `${label}: ${value}`;

package/lib/cli/assistant/transcript-text.mjs

@@ -1,5 +1,6 @@
 import stripAnsi from "strip-ansi";
 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 } = {}) {
@@ -25,9 +26,65 @@ function renderBlockLines(block, { ansi = false } = {}) {
     const normalized = ansi ? rendered : stripAnsi(rendered);
     return prefixLines(`${marker}${title}`, normalized);
   }
+  if (block.format === "command") {
+    return renderCommandBlockLines(block);
+  }
   return prefixLines(`${marker}${title}`, text);
 }
 
+function renderCommandBlockLines(block) {
+  const header = `${block.marker || ""}${block.title ? ` ${block.title}` : ""}`.trim();
+  const body = [];
+  const command = formatCommandLine(block.command);
+  const status = formatCommandStatus(block);
+  if (command) body.push(`$ ${command}`);
+  if (status) body.push(status);
+  if (block.codeBlock) {
+    body.push("");
+    body.push(...renderCodeBlockText(block.codeBlock));
+  } else {
+    for (const line of block.outputPreview?.lines || []) body.push(String(line));
+    const omitted = block.outputPreview?.omittedLineCount || block.omittedOutputLineCount || 0;
+    if (omitted > 0) body.push(`... ${omitted} more line${omitted === 1 ? "" : "s"} omitted`);
+  }
+  if (!command && body.length === 0 && block.text) body.push(String(block.text));
+  return boxLines([header, ...body].filter(Boolean));
+}
+
+function formatCommandLine(command) {
+  if (!command) return null;
+  if (typeof command === "string") return command;
+  try {
+    return JSON.stringify(command);
+  } catch {
+    return String(command);
+  }
+}
+
+function formatCommandStatus(block) {
+  if (block.status === "running") return "running";
+  if (block.status === "error") return block.exitCode == null ? "failed" : `failed · exit code ${block.exitCode}`;
+  if (block.exitCode != null) return `completed · exit code ${block.exitCode}`;
+  if (block.status === "done") return "completed";
+  if (block.text && !block.command) return block.text;
+  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)}╯`;
+  return [
+    top,
+    ...lines.map((line) => `│ ${line}${" ".repeat(width - visibleWidth(line))} │`),
+    bottom,
+  ];
+}
+
+function visibleWidth(value) {
+  return stripAnsi(String(value || "")).length;
+}
+
 function prefixLines(prefix, text) {
   const lines = String(text || "").split(/\r?\n/);
   if (lines.length === 0 || (lines.length === 1 && lines[0] === "")) return [prefix];

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

@@ -1,6 +1,9 @@
 import path from "path";
 import { formatContextRemaining } from "./context-window.mjs";
 
+const PROVIDER_COMMAND_OUTPUT_PREVIEW_LINES = 12;
+const PROVIDER_DIFF_PREVIEW_LINES = 80;
+
 export function buildAssistantViewModel(snapshot, { cwd = process.cwd(), terminalWidth = 100 } = {}) {
   const providerLabel = buildProviderLabel(snapshot);
   const repoName = path.basename(cwd || process.cwd()) || "repository";
@@ -56,7 +59,7 @@ export function buildTranscriptBlocks(messages) {
       return {
         id: message.id,
         kind: classifyToolBlock(message),
-        format: "structured",
+        format: "command",
         marker: "●",
         title: message.title || message.toolName || "Tool",
         text: message.text || "",
@@ -65,7 +68,19 @@ export function buildTranscriptBlocks(messages) {
         exitCode: message.data?.exitCode ?? null,
       };
     }
-    if (role === "provider-activity" || role === "provider-tool" || role === "provider-error") {
+    if (role === "provider-tool") {
+      return {
+        id: message.id,
+        kind: "provider-command",
+        format: "command",
+        marker: "◌",
+        title: message.title || "provider command",
+        text: message.text || "",
+        status: message.status || null,
+        ...buildProviderCommandModel(message),
+      };
+    }
+    if (role === "provider-activity" || role === "provider-error") {
       return {
         id: message.id,
         kind: role,
@@ -137,6 +152,106 @@ function classifyToolBlock(message) {
   return "tool-result";
 }
 
+function buildProviderCommandModel(message) {
+  const event = message.data || {};
+  const rawCommand = event.input || event.data?.command || event.data?.input || null;
+  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 diffPreview = diffText ? summarizeOutput(diffText, PROVIDER_DIFF_PREVIEW_LINES) : null;
+  const outputPreview = summarizeOutput(output, PROVIDER_COMMAND_OUTPUT_PREVIEW_LINES);
+  return {
+    command: diffPreview ? summarizeProviderEditCommand(event, rawCommand) : rawCommand,
+    exitCode,
+    codeBlock: diffPreview
+      ? {
+          language: "diff",
+          lines: diffPreview.lines,
+          omittedLineCount: diffPreview.omittedLineCount,
+        }
+      : null,
+    outputPreview,
+    outputLineCount: countLines(output),
+    omittedOutputLineCount: outputPreview.omittedLineCount,
+    status,
+  };
+}
+
+function summarizeProviderEditCommand(event, rawCommand) {
+  const name = event.name ? String(event.name) : "edit";
+  if (name && name !== "command") return name;
+  const command = String(rawCommand || "").trim();
+  if (!command) return "file edit";
+  if (looksLikeDiff(command)) return "file edit";
+  return command;
+}
+
+function extractProviderDiffText(event) {
+  const candidates = [
+    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;
+  }
+  return null;
+}
+
+function stringifyMaybe(value) {
+  if (value == null) return "";
+  if (typeof value === "string") return value;
+  try {
+    return JSON.stringify(value, null, 2);
+  } catch {
+    return String(value);
+  }
+}
+
+function looksLikeDiff(value) {
+  const text = String(value || "");
+  if (!text.trim()) return false;
+  if (/\*\*\* Begin Patch[\s\S]*\*\*\* End Patch/.test(text)) return true;
+  if (/^diff --git\b/m.test(text)) return true;
+  if (/^@@\s/m.test(text)) return true;
+  if (/^\+\+\+\s.+\n---\s.+/m.test(text) || /^---\s.+\n\+\+\+\s.+/m.test(text)) return true;
+  const changedLines = text.split(/\r?\n/).filter((line) => /^[+-](?![+-]{2})/.test(line));
+  return changedLines.length >= 2 && /(patch|diff|apply_patch|edit|update file|add file|delete file)/i.test(text);
+}
+
+function providerCommandStatus(event) {
+  if (event.type === "tool-start" || event.type === "tool-update") return "running";
+  if (event.status === "error") return "error";
+  return event.status ? "done" : null;
+}
+
+function summarizeOutput(value, maxLines) {
+  const text = String(value || "").replace(/\r/g, "");
+  if (!text.trim()) return { lines: [], omittedLineCount: 0 };
+  const lines = text.split("\n");
+  const trimmedLines = lines.at(-1) === "" ? lines.slice(0, -1) : lines;
+  return {
+    lines: trimmedLines.slice(0, maxLines),
+    omittedLineCount: Math.max(0, trimmedLines.length - maxLines),
+  };
+}
+
+function countLines(value) {
+  const text = String(value || "").replace(/\r/g, "");
+  if (!text.trim()) return 0;
+  const lines = text.split("\n");
+  return lines.at(-1) === "" ? lines.length - 1 : lines.length;
+}
+
 function shortenHome(value) {
   const text = String(value || "");
   const home = process.env.HOME;

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

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

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

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