@elench/testkit 0.1.102 → 0.1.104

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

@@ -5,7 +5,7 @@ import {
   buildToolEvent,
   createHostedSessionRunner,
 } from "./shared.mjs";
-import { providerAssistantDelta, providerAssistantFinal, providerToolEnd, providerToolStart } from "./events.mjs";
+import { providerAssistantDelta, providerAssistantFinal, providerToolStart } from "./events.mjs";
 
 export function startClaudeHostedSession({
   command = "claude",
@@ -130,7 +130,6 @@ export function parseClaudePayload(payload) {
     } else if (typeof payload.result === "string") {
       const event = providerAssistantFinal(payload.result);
       if (event) events.push(event);
-      events.push(providerToolEnd("claude", { status: "ok", durationMs: payload.duration_ms || null }));
     }
     return events;
   }

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

@@ -4,12 +4,18 @@ import path from "path";
 import { execa } from "execa";
 import {
   buildErrorEvent,
-  buildStatusEvent,
   buildToolEvent,
   createHostedSessionRunner,
   readTextFileIfPresent,
 } from "./shared.mjs";
-import { providerAssistantDelta, providerAssistantFinal, providerToolEnd, providerToolStart, providerToolUpdate } from "./events.mjs";
+import {
+  providerAssistantDelta,
+  providerAssistantFinal,
+  providerStatus,
+  providerToolEnd,
+  providerToolStart,
+  providerToolUpdate,
+} from "./events.mjs";
 
 export function startCodexHostedSession({
   command = "codex",
@@ -99,19 +105,22 @@ export function parseCodexPayload(payload) {
   }
 
   if (type === "thread.started") {
-    const event = buildStatusEvent(payload.thread_id ? `Codex thread ${payload.thread_id} started` : "Codex thread started");
+    const event = providerStatus(
+      payload.thread_id ? `Codex thread ${payload.thread_id} started` : "Codex thread started",
+      { transient: true }
+    );
     if (event) events.push(event);
     return events;
   }
 
   if (type === "turn.started") {
-    const event = buildStatusEvent("Codex turn started");
+    const event = providerStatus("Codex turn started", { transient: true });
     if (event) events.push(event);
     return events;
   }
 
   if (type === "turn.completed") {
-    const event = providerToolEnd("codex", { status: "ok", usage: payload.usage || null });
+    const event = providerStatus("Codex turn completed", { transient: true, usage: payload.usage || null });
     if (event) events.push(event);
     return events;
   }
@@ -146,31 +155,46 @@ export function parseCodexPayload(payload) {
     return events;
   }
 
-  const statusEvent = buildStatusEvent(type ? `Codex event: ${type}` : JSON.stringify(payload));
+  const statusEvent = providerStatus(type ? `Codex event: ${type}` : JSON.stringify(payload));
   if (statusEvent) events.push(statusEvent);
   return events;
 }
 
 function codexItemStartedEvent(item) {
   if (!item || typeof item !== "object") return null;
-  if (item.type === "command_execution" || item.type === "tool_call") {
-    return providerToolStart(item.command || item.name || item.type, {
+  if (item.type === "command_execution") {
+    return providerToolStart("command", {
+      id: item.id || null,
+      input: item.command || item.input || null,
+    });
+  }
+  if (item.type === "tool_call") {
+    return providerToolStart(item.name || item.type, {
       id: item.id || null,
       input: item.arguments || item.input || null,
     });
   }
-  if (item.type === "agent_message") return buildStatusEvent("Codex started response");
-  if (item.type) return buildStatusEvent(`Codex started ${item.type}`);
+  if (item.type === "agent_message") return providerStatus("Codex started response", { transient: true });
+  if (item.type) return providerStatus(`Codex started ${item.type}`);
   return null;
 }
 
 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", {
+      id: item.id || null,
+      text: item.output || item.status || null,
+      data: item,
+    });
   }
-  if (item.type === "command_execution" || item.type === "tool_call") {
-    return providerToolUpdate(item.command || item.name || item.type, {
+  if (item.type === "tool_call") {
+    return providerToolUpdate(item.name || item.type, {
       id: item.id || null,
       text: item.output || item.status || null,
       data: item,
@@ -182,16 +206,26 @@ 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", {
+      id: item.id || null,
+      status: item.status === "failed" ? "error" : "ok",
+      output: item.output || null,
+      data: item,
+    });
   }
-  if (item.type === "command_execution" || item.type === "tool_call") {
-    return providerToolEnd(item.command || item.name || item.type, {
+  if (item.type === "tool_call") {
+    return providerToolEnd(item.name || item.type, {
       id: item.id || null,
       status: item.status === "failed" ? "error" : "ok",
       output: item.output || null,
       data: item,
     });
   }
-  if (item.type) return buildStatusEvent(`Codex completed ${item.type}`);
+  if (item.type) return providerStatus(`Codex completed ${item.type}`);
   return null;
 }

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

@@ -40,6 +40,7 @@ export function createHostedSessionRunner({
   emit(providerEvent("session-start"));
 
   const stdoutReader = readline.createInterface({ input: child.stdout });
+  const stdoutClosed = waitForReaderClose(stdoutReader);
   stdoutReader.on("line", (line) => {
     onRawLine?.({ provider, stream: "stdout", line });
     const parsed = tryParseJson(line);
@@ -53,6 +54,7 @@ export function createHostedSessionRunner({
   });
 
   const stderrReader = readline.createInterface({ input: child.stderr });
+  const stderrClosed = waitForReaderClose(stderrReader);
   stderrReader.on("line", (line) => {
     onRawLine?.({ provider, stream: "stderr", line });
     if (shouldIgnoreStatus?.(line)) return;
@@ -61,6 +63,7 @@ export function createHostedSessionRunner({
 
   const completion = (async () => {
     const result = await child;
+    await Promise.all([stdoutClosed, stderrClosed]);
     const fileFinalText = readFinalText ? readFinalText(result) : null;
     const resolvedFinalText = fileFinalText || finalText || assistantText.trim() || null;
     if ((result.exitCode ?? 0) !== 0) {
@@ -97,6 +100,12 @@ export function createHostedSessionRunner({
   };
 }
 
+function waitForReaderClose(reader) {
+  return new Promise((resolve) => {
+    reader.once("close", resolve);
+  });
+}
+
 export function tryParseJson(line) {
   const normalized = String(line || "").trim();
   if (!normalized) return null;

package/lib/cli/assistant/session.mjs

@@ -53,7 +53,12 @@ export async function runAssistantConversationTurn({
     effort: runtimeSettings.effort || null,
   });
   onStatus?.(`Thinking with ${resolvedProvider}...`);
-  onProviderEvent?.({ type: "status", provider: resolvedProvider, text: `Thinking with ${resolvedProvider}...` });
+  onProviderEvent?.({
+    type: "status",
+    provider: resolvedProvider,
+    text: `Thinking with ${resolvedProvider}...`,
+    transient: true,
+  });
 
   observer.start();
   try {

package/lib/cli/assistant/state.mjs

@@ -635,12 +635,17 @@ function handleAssistantToolEvent(state, event, appendMessage) {
 function createProviderTurnState() {
   return {
     assistantMessageId: null,
+    assistantMessageIdsByProviderItem: new Map(),
     lastActivityText: null,
   };
 }
 
 function handleProviderEvent(turn, event, { appendMessage, updateMessage, setStatus } = {}) {
   if (!event) return;
+  if (event.transient || event.display === false) {
+    if (event.type === "status" && event.text) setStatus?.(event.text);
+    return;
+  }
   if (event.type === "assistant-delta") {
     appendAssistantDelta(turn, event, { appendMessage, updateMessage });
     setStatus?.(`${event.provider || "provider"} responding`);
@@ -652,21 +657,11 @@ function handleProviderEvent(turn, event, { appendMessage, updateMessage, setSta
     return;
   }
   if (event.type === "session-start") {
-    appendProviderActivity(turn, {
-      role: "provider-activity",
-      title: formatProviderName(event.provider),
-      text: "Session started",
-      data: event,
-    }, { appendMessage, setStatus });
+    setStatus?.(`${event.provider || "provider"} session started`);
     return;
   }
   if (event.type === "session-end") {
-    appendProviderActivity(turn, {
-      role: "provider-activity",
-      title: formatProviderName(event.provider),
-      text: Number.isInteger(event.exitCode) ? `Session ended with exit code ${event.exitCode}` : "Session ended",
-      data: event,
-    }, { appendMessage, setStatus });
+    setStatus?.(`${event.provider || "provider"} session ended`);
     return;
   }
   if (event.type === "status") {
@@ -699,15 +694,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",
   }));
@@ -715,20 +714,29 @@ 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 appendProviderActivity(turn, message, { appendMessage, setStatus }) {
   const text = String(message.text || "").trim();
   if (!text) return;

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

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

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

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