@elench/testkit 0.1.109 → 0.1.111

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

@@ -5,7 +5,12 @@ import {
   buildToolEvent,
   createHostedSessionRunner,
 } from "./shared.mjs";
-import { providerAssistantDelta, providerAssistantFinal, providerToolStart } from "./events.mjs";
+import {
+  providerAssistantDelta,
+  providerAssistantFinal,
+  providerToolStart,
+  providerToolUpdate,
+} from "./events.mjs";
 
 export function startClaudeHostedSession({
   command = "claude",
@@ -13,6 +18,7 @@ export function startClaudeHostedSession({
   prompt,
   onEvent,
   onRawLine,
+  timeoutMs = null,
   purpose = "assistant",
   model = null,
   effort = null,
@@ -46,12 +52,16 @@ export function startClaudeHostedSession({
     env,
   });
 
+  const parserState = createClaudeParserState();
   return createHostedSessionRunner({
     provider: "claude",
     child,
     onEvent,
     onRawLine,
-    parsePayload: parseClaudePayload,
+    timeoutMs,
+    parsePayload(payload) {
+      return parseClaudePayload(payload, parserState);
+    },
     readFinalText(result) {
       return readClaudeFinalText(result?.stdout || "") || null;
     },
@@ -60,10 +70,17 @@ export function startClaudeHostedSession({
 
 function normalizeProviderArgs(providerArgs) {
   if (!Array.isArray(providerArgs)) return [];
-  return providerArgs.flatMap((arg) => String(arg || "").split(/\s+/).filter(Boolean));
+  return providerArgs.map((arg) => String(arg || "").trim()).filter(Boolean);
 }
 
-export function parseClaudePayload(payload) {
+export function createClaudeParserState() {
+  return {
+    currentMessageId: null,
+    contentBlocksByIndex: new Map(),
+  };
+}
+
+export function parseClaudePayload(payload, state = null) {
   const events = [];
   if (!payload || typeof payload !== "object") return events;
 
@@ -77,24 +94,54 @@ export function parseClaudePayload(payload) {
 
   if (type === "stream_event") {
     const streamEvent = payload.event || {};
+    if (streamEvent.type === "message_start") {
+      if (state) state.currentMessageId = streamEvent.message?.id || null;
+      return events;
+    }
     if (streamEvent.type === "content_block_delta" && streamEvent.delta?.type === "text_delta") {
       const text = String(streamEvent.delta.text || "");
-      const event = providerAssistantDelta(text);
+      const event = providerAssistantDelta(text, messageIdFields(state?.currentMessageId));
       if (event) events.push(event);
       return events;
     }
     if (streamEvent.type === "content_block_start" && streamEvent.content_block?.type === "tool_use") {
       const tool = streamEvent.content_block;
+      const block = {
+        id: tool.id || streamEvent.index,
+        name: tool.name || tool.tool_name || "tool_use",
+        input: tool.input || null,
+        inputJson: "",
+      };
+      state?.contentBlocksByIndex?.set(streamEvent.index, block);
       const event = providerToolStart(
-        tool.name || tool.tool_name || "tool_use",
+        block.name,
         {
-          id: tool.id || streamEvent.index,
-          input: tool.input || null,
+          id: block.id,
+          input: block.input,
         }
       );
       if (event) events.push(event);
       return events;
     }
+    if (streamEvent.type === "content_block_delta" && streamEvent.delta?.type === "input_json_delta") {
+      const block = state?.contentBlocksByIndex?.get(streamEvent.index);
+      if (block) block.inputJson += String(streamEvent.delta.partial_json || "");
+      return events;
+    }
+    if (streamEvent.type === "content_block_stop") {
+      const block = state?.contentBlocksByIndex?.get(streamEvent.index);
+      if (!block) return events;
+      state.contentBlocksByIndex.delete(streamEvent.index);
+      const parsedInput = parseClaudeToolInput(block.inputJson) ?? block.input;
+      if (parsedInput != null) {
+        const event = providerToolUpdate(block.name, {
+          id: block.id,
+          input: parsedInput,
+        });
+        if (event) events.push(event);
+      }
+      return events;
+    }
     if (streamEvent.type === "tool_use" || streamEvent.content_block?.type === "tool_use") {
       const tool = streamEvent.content_block || streamEvent;
       const event = buildToolEvent(
@@ -107,18 +154,10 @@ export function parseClaudePayload(payload) {
     return events;
   }
 
-  if (type && /tool/i.test(type)) {
-    const event = buildToolEvent(
-      payload.name || payload.tool_name || payload.tool || type,
-      payload.detail || payload.summary || null
-    );
-    if (event) events.push(event);
-    return events;
-  }
-
   if (type === "assistant") {
     const fragments = extractClaudeTextFragments(payload.message?.content || payload.content || []);
-    const event = providerAssistantFinal(fragments.join(""));
+    const id = payload.message?.id || state?.currentMessageId || null;
+    const event = providerAssistantFinal(fragments.join(""), messageIdFields(id));
     if (event) events.push(event);
     return events;
   }
@@ -138,11 +177,30 @@ export function parseClaudePayload(payload) {
     return events;
   }
 
-  const statusEvent = buildStatusEvent(type ? `Claude event: ${type}` : JSON.stringify(payload));
+  const statusEvent = buildStatusEvent(type ? `Claude event: ${type}` : "Claude emitted an unknown event");
+  if (statusEvent) {
+    statusEvent.transient = true;
+    statusEvent.display = false;
+    statusEvent.data = payload;
+  }
   if (statusEvent) events.push(statusEvent);
   return events;
 }
 
+function messageIdFields(id) {
+  return id ? { id: String(id) } : {};
+}
+
+function parseClaudeToolInput(value) {
+  const text = String(value || "").trim();
+  if (!text) return null;
+  try {
+    return JSON.parse(text);
+  } catch {
+    return text;
+  }
+}
+
 export function readClaudeFinalText(stdout) {
   const lines = String(stdout || "")
     .split("\n")

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

@@ -4,7 +4,6 @@ import path from "path";
 import { execa } from "execa";
 import {
   buildErrorEvent,
-  buildToolEvent,
   createHostedSessionRunner,
   readTextFileIfPresent,
 } from "./shared.mjs";
@@ -23,6 +22,7 @@ export function startCodexHostedSession({
   prompt,
   onEvent,
   onRawLine,
+  timeoutMs = null,
   purpose = "assistant",
   model = null,
   providerArgs = [],
@@ -52,6 +52,7 @@ export function startCodexHostedSession({
     child,
     onEvent,
     onRawLine,
+    timeoutMs,
     parsePayload: parseCodexPayload,
     shouldIgnoreStatus(message) {
       return String(message || "").trim() === "Reading additional input from stdin...";
@@ -90,7 +91,7 @@ export function buildCodexArgs({
 
 function normalizeProviderArgs(providerArgs) {
   if (!Array.isArray(providerArgs)) return [];
-  return providerArgs.flatMap((arg) => String(arg || "").split(/\s+/).filter(Boolean));
+  return providerArgs.map((arg) => String(arg || "").trim()).filter(Boolean);
 }
 
 export function parseCodexPayload(payload) {
@@ -146,16 +147,11 @@ export function parseCodexPayload(payload) {
     return events;
   }
 
-  if (type && /(tool|command|patch|exec)/i.test(type)) {
-    const event = buildToolEvent(
-      payload.name || payload.tool_name || payload.command || type,
-      payload.detail || payload.summary || payload.status || null
-    );
-    if (event) events.push(event);
-    return events;
-  }
-
-  const statusEvent = providerStatus(type ? `Codex event: ${type}` : JSON.stringify(payload));
+  const statusEvent = providerStatus(type ? `Codex event: ${type}` : "Codex emitted an unknown event", {
+    transient: true,
+    display: false,
+    data: payload,
+  });
   if (statusEvent) events.push(statusEvent);
   return events;
 }

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

@@ -64,13 +64,14 @@ export function startProviderSession({
   prompt,
   onEvent,
   onRawLine,
+  timeoutMs,
   purpose = "assistant",
   env = process.env,
 } = {}) {
   const resolvedProvider = resolvePreferredProvider(provider, env);
   const command = resolveProviderBinary(resolvedProvider, env);
   if (resolvedProvider === "claude") {
-    return startClaudeHostedSession({ command, cwd, prompt, onEvent, onRawLine, purpose, model, effort, providerArgs, env });
+    return startClaudeHostedSession({ command, cwd, prompt, onEvent, onRawLine, timeoutMs, purpose, model, effort, providerArgs, env });
   }
-  return startCodexHostedSession({ command, cwd, prompt, onEvent, onRawLine, purpose, model, providerArgs, env });
+  return startCodexHostedSession({ command, cwd, prompt, onEvent, onRawLine, timeoutMs, purpose, model, providerArgs, env });
 }

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

@@ -13,6 +13,7 @@ export function createHostedSessionRunner({
   child,
   onEvent,
   onRawLine,
+  timeoutMs = null,
   parsePayload,
   readFinalText,
   shouldIgnoreStatus,
@@ -22,6 +23,7 @@ export function createHostedSessionRunner({
   let assistantText = "";
   let finalText = null;
   let lastErrorMessage = null;
+  let timedOut = false;
 
   const emit = (event) => {
     if (!event) return;
@@ -38,6 +40,18 @@ export function createHostedSessionRunner({
   };
 
   emit(providerEvent("session-start"));
+  const timeout = Number.isFinite(Number(timeoutMs)) && Number(timeoutMs) > 0
+    ? setTimeout(() => {
+        timedOut = true;
+        lastErrorMessage = `${provider} timed out after ${Math.floor(Number(timeoutMs))}ms`;
+        emit(providerError(lastErrorMessage));
+        try {
+          child.kill("SIGTERM");
+        } catch {
+          // Ignore timeout cancellation races.
+        }
+      }, Math.floor(Number(timeoutMs)))
+    : null;
 
   const stdoutReader = readline.createInterface({ input: child.stdout });
   const stdoutClosed = waitForReaderClose(stdoutReader);
@@ -62,11 +76,16 @@ export function createHostedSessionRunner({
   });
 
   const completion = (async () => {
-    const result = await child;
-    await Promise.all([stdoutClosed, stderrClosed]);
+    let result;
+    try {
+      result = await child;
+      await Promise.all([stdoutClosed, stderrClosed]);
+    } finally {
+      if (timeout) clearTimeout(timeout);
+    }
     const fileFinalText = readFinalText ? readFinalText(result) : null;
     const resolvedFinalText = fileFinalText || finalText || assistantText.trim() || null;
-    if ((result.exitCode ?? 0) !== 0) {
+    if (timedOut || (result.exitCode ?? 0) !== 0) {
       const message = lastErrorMessage || result.stderr || `${provider} exited with code ${result.exitCode ?? 1}`;
       emit(providerError(message));
       throw new Error(message);

package/lib/cli/assistant/quality-signal-strip.mjs

@@ -0,0 +1,103 @@
+import React, { createElement } from "react";
+import { Box, Text } from "ink";
+import { cyan, dim, green, red, yellow } from "../terminal/colors.mjs";
+import { measureWidth, truncateText } from "../terminal/layout.mjs";
+
+const LABEL_ITEM_SEPARATOR = "  ";
+const ITEM_SEPARATOR = " · ";
+const MIN_TRUNCATED_ITEM_WIDTH = 4;
+
+export function fitQualitySignal(signal, { width = 100 } = {}) {
+  const availableWidth = Math.max(0, Number(width) || 0);
+  const label = normalizeText(signal?.label) || "Quality signal";
+  const items = normalizeItems(signal?.items);
+  if (availableWidth <= 0) return { label: "", items: [] };
+  if (items.length === 0) {
+    return {
+      label: truncateText(label, availableWidth),
+      items: [],
+    };
+  }
+
+  for (let count = items.length; count >= 1; count -= 1) {
+    const candidate = {
+      label,
+      items: items.slice(0, count),
+    };
+    if (measureWidth(formatQualitySignalText(candidate)) <= availableWidth) return candidate;
+  }
+
+  const firstItemWidth = availableWidth - measureWidth(label) - measureWidth(LABEL_ITEM_SEPARATOR);
+  if (firstItemWidth >= MIN_TRUNCATED_ITEM_WIDTH) {
+    return {
+      label,
+      items: [
+        {
+          ...items[0],
+          text: truncateText(items[0].text, firstItemWidth),
+        },
+      ],
+    };
+  }
+
+  return {
+    label: truncateText(label, availableWidth),
+    items: [],
+  };
+}
+
+export function formatQualitySignalText(signal) {
+  const label = normalizeText(signal?.label) || "Quality signal";
+  const items = normalizeItems(signal?.items);
+  if (items.length === 0) return label;
+  return `${label}${LABEL_ITEM_SEPARATOR}${items.map((item) => item.text).join(ITEM_SEPARATOR)}`;
+}
+
+export function QualitySignalStrip({ signal, width = 100 } = {}) {
+  const fitted = fitQualitySignal(signal, { width });
+  if (!fitted.label) return null;
+  return createElement(
+    Box,
+    {
+      height: 1,
+      flexDirection: "row",
+    },
+    createElement(
+      Text,
+      null,
+      dim(fitted.label),
+      fitted.items.length > 0 ? LABEL_ITEM_SEPARATOR : "",
+      ...fitted.items.flatMap((item, index) => [
+        index > 0 ? dim(ITEM_SEPARATOR) : "",
+        colorQualitySignalItem(item),
+      ])
+    )
+  );
+}
+
+function normalizeItems(items) {
+  return (Array.isArray(items) ? items : [])
+    .map((item) => ({
+      id: normalizeText(item?.id),
+      text: normalizeText(item?.text),
+      tone: normalizeTone(item?.tone),
+    }))
+    .filter((item) => item.text);
+}
+
+function normalizeText(value) {
+  return String(value ?? "").replace(/\s+/g, " ").trim();
+}
+
+function normalizeTone(value) {
+  if (value === "good" || value === "warning" || value === "danger" || value === "progress") return value;
+  return "neutral";
+}
+
+function colorQualitySignalItem(item) {
+  if (item.tone === "good") return green(item.text);
+  if (item.tone === "warning") return yellow(item.text);
+  if (item.tone === "danger") return red(item.text);
+  if (item.tone === "progress") return cyan(item.text);
+  return item.text;
+}

package/lib/cli/assistant/session-paths.d.mts

@@ -0,0 +1,23 @@
+export interface AssistantSessionPaths {
+    assistantRoot: string;
+    sessionsDir: string;
+    contextDir: string;
+    contextPath: string;
+    currentPath: string;
+    summaryPath: string;
+    selectionPath: string;
+    commandsPath: string;
+    commandLogPath: string;
+    resultDir: string;
+    focusedDetailPath: string;
+    focusedLogsPath: string;
+    focusedArtifactsPath: string;
+    focusedSetupPath: string;
+    binDir: string;
+    wrapperPath: string;
+    providerEventsPath: string;
+    providerRawPath: string;
+}
+export declare function createAssistantSessionId(now?: number, random?: () => number): string;
+export declare function assistantSessionPaths(productDir: string, sessionId: string): AssistantSessionPaths;
+//# sourceMappingURL=session-paths.d.mts.map

package/lib/cli/assistant/session-paths.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-paths.d.mts","sourceRoot":"","sources":["../../../src/cli/assistant/session-paths.mts"],"names":[],"mappings":"AAEA,MAAM,WAAW,qBAAqB;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,wBAAwB,CAAC,GAAG,GAAE,MAAmB,EAAE,MAAM,GAAE,MAAM,MAAoB,GAAG,MAAM,CAE7G;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,qBAAqB,CAyBlG"}

package/lib/cli/assistant/session-paths.mjs

@@ -0,0 +1,31 @@
+import path from "node:path";
+export function createAssistantSessionId(now = Date.now(), random = Math.random) {
+    return `session-${now}-${random().toString(36).slice(2, 10)}`;
+}
+export function assistantSessionPaths(productDir, sessionId) {
+    const assistantRoot = path.join(productDir, ".testkit", "assistant");
+    const sessionsDir = path.join(assistantRoot, "sessions");
+    const contextDir = path.join(sessionsDir, sessionId);
+    const binDir = path.join(contextDir, "bin");
+    return {
+        assistantRoot,
+        sessionsDir,
+        contextDir,
+        contextPath: path.join(contextDir, "context.md"),
+        currentPath: path.join(assistantRoot, "current.json"),
+        summaryPath: path.join(contextDir, "latest-run-summary.json"),
+        selectionPath: path.join(contextDir, "current-selection.json"),
+        commandsPath: path.join(contextDir, "commands.md"),
+        commandLogPath: path.join(contextDir, "commands.jsonl"),
+        resultDir: path.join(contextDir, "command-results"),
+        focusedDetailPath: path.join(contextDir, "focused-detail.txt"),
+        focusedLogsPath: path.join(contextDir, "focused-logs.txt"),
+        focusedArtifactsPath: path.join(contextDir, "focused-artifacts.txt"),
+        focusedSetupPath: path.join(contextDir, "focused-setup.txt"),
+        binDir,
+        wrapperPath: path.join(binDir, "testkit"),
+        providerEventsPath: path.join(contextDir, "provider-events.jsonl"),
+        providerRawPath: path.join(contextDir, "provider-raw.jsonl"),
+    };
+}
+//# sourceMappingURL=session-paths.mjs.map

package/lib/cli/assistant/session-paths.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-paths.mjs","sourceRoot":"","sources":["../../../src/cli/assistant/session-paths.mts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAuB7B,MAAM,UAAU,wBAAwB,CAAC,MAAc,IAAI,CAAC,GAAG,EAAE,EAAE,SAAuB,IAAI,CAAC,MAAM;IACnG,OAAO,WAAW,GAAG,IAAI,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,UAAkB,EAAE,SAAiB;IACzE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC5C,OAAO;QACL,aAAa;QACb,WAAW;QACX,UAAU;QACV,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC;QAChD,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC;QACrD,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,yBAAyB,CAAC;QAC7D,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,wBAAwB,CAAC;QAC9D,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC;QAClD,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC;QACvD,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC;QACnD,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC;QAC9D,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC;QAC1D,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,uBAAuB,CAAC;QACpE,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC;QAC5D,MAAM;QACN,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC;QACzC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,uBAAuB,CAAC;QAClE,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC;KAC7D,CAAC;AACJ,CAAC"}

package/lib/cli/assistant/session.mjs

@@ -39,11 +39,12 @@ export async function runAssistantConversationTurn({
   const runtimeSettings = settings || { provider };
   const resolvedProvider = resolvePreferredProvider(runtimeSettings.provider || provider, env);
   const providerEnv = commandLog?.providerEnv?.(env) || env;
+  const timeoutMs = resolveProviderTimeoutMs(providerEnv);
   const tracePath = shouldTraceProviderEvents(env, providerEnv)
-    ? path.join(commandLog?.contextDir || path.join(productDir, ".testkit", "assistant"), "provider-events.jsonl")
+    ? commandLog?.providerEventsPath || path.join(commandLog?.contextDir || path.join(productDir, ".testkit", "assistant"), "provider-events.jsonl")
     : null;
   const rawTracePath = shouldTraceProviderEvents(env, providerEnv)
-    ? path.join(commandLog?.contextDir || path.join(productDir, ".testkit", "assistant"), "provider-raw.jsonl")
+    ? commandLog?.providerRawPath || path.join(commandLog?.contextDir || path.join(productDir, ".testkit", "assistant"), "provider-raw.jsonl")
     : null;
   onResolvedProvider?.(resolvedProvider);
   onPrompt?.({
@@ -67,6 +68,7 @@ export async function runAssistantConversationTurn({
       model: runtimeSettings.model || null,
       effort: runtimeSettings.effort || null,
       providerArgs: runtimeSettings.providerArgs || [],
+      timeoutMs,
       cwd: productDir,
       prompt,
       purpose: "assistant",
@@ -91,6 +93,12 @@ export async function runAssistantConversationTurn({
   }
 }
 
+function resolveProviderTimeoutMs(env) {
+  const explicit = Number(env?.TESTKIT_ASSISTANT_PROVIDER_TIMEOUT_MS);
+  if (Number.isFinite(explicit) && explicit > 0) return Math.floor(explicit);
+  return 600_000;
+}
+
 function formatProviderEvent(event) {
   if (event.type === "tool-start") {
     return `${event.provider}: ${event.name}${event.detail ? ` (${event.detail})` : ""}`;

package/lib/cli/assistant/state.mjs

@@ -41,6 +41,8 @@ import {
 } from "./composer.mjs";
 import { buildContextUsage } from "./context-window.mjs";
 
+const SNAPSHOT_MESSAGE_TEXT_LIMIT = 20_000;
+
 export function createAssistantState({
   productDir,
   provider,
@@ -62,6 +64,7 @@ export function createAssistantState({
 
   const listeners = new Set();
   const messages = [];
+  const diagnostics = [];
   let composerState = createComposerState();
   let notice = null;
   let busy = false;
@@ -84,6 +87,7 @@ export function createAssistantState({
   if (sanitizedStartup.notice) notice = sanitizedStartup.notice;
   let activeStatus = null;
   let startupNoticeEmitted = false;
+  let lastTurnError = null;
   let contextUsage = buildContextUsage({
     provider: resolvedProviderName || settings.provider,
     model: settings.model,
@@ -130,6 +134,14 @@ export function createAssistantState({
     notify();
   }
 
+  function appendDiagnostic(diagnostic) {
+    diagnostics.push({
+      timestamp: new Date().toISOString(),
+      ...diagnostic,
+    });
+    notify();
+  }
+
   function refreshContextPack() {
     commandLog.refresh();
   }
@@ -334,6 +346,20 @@ export function createAssistantState({
     async submitInput(input) {
       const trimmed = String(input || "").trim();
       if (!trimmed) return;
+      if (busy) {
+        const message = "Assistant is already handling a turn.";
+        lastTurnError = {
+          kind: "concurrency",
+          message,
+        };
+        appendDiagnostic({
+          level: "error",
+          code: "assistant_turn_already_active",
+          message,
+        });
+        throw new Error(message);
+      }
+      lastTurnError = null;
       if (notice && !startupNoticeEmitted) {
         startupNoticeEmitted = true;
         appendMessage({ role: "system", text: notice });
@@ -413,9 +439,13 @@ export function createAssistantState({
           },
         });
       } catch (error) {
+        lastTurnError = {
+          kind: "provider",
+          message: error instanceof Error ? error.message : String(error),
+        };
         appendMessage({
           role: "system",
-          text: error instanceof Error ? error.message : String(error),
+          text: lastTurnError.message,
         });
       } finally {
         refreshContextPack();
@@ -433,7 +463,7 @@ export function createAssistantState({
         context: buildContextSelection(runState.getSnapshot()),
         run: runState.getSnapshot(),
         productDir,
-        messages: [...messages],
+        messages: messages.map(serializeMessageForSnapshot),
         composer: composerState.text,
         composerCursor: composerState.cursor,
         notice,
@@ -445,15 +475,23 @@ export function createAssistantState({
         providerArgs: [...settings.providerArgs],
         cliConfig,
         activeStatus,
+        lastTurnError,
+        diagnostics: [...diagnostics],
         contextUsage,
         liveRunSession: serializeRunSession(liveRunSession),
         lastRunSession: serializeRunSession(lastRunSession),
         contextPaths: {
+          sessionId: commandLog.sessionId,
+          currentPath: commandLog.currentPath,
+          contextDir: commandLog.contextDir,
           contextPath: commandLog.contextPath,
           summaryPath: commandLog.summaryPath,
           selectionPath: commandLog.selectionPath,
           commandsPath: commandLog.commandsPath,
           commandLogPath: commandLog.commandLogPath,
+          resultDir: commandLog.resultDir,
+          providerEventsPath: commandLog.providerEventsPath,
+          providerRawPath: commandLog.providerRawPath,
         },
       };
     },
@@ -891,6 +929,17 @@ function serializeRunSession(session) {
   };
 }
 
+function serializeMessageForSnapshot(message) {
+  const text = String(message?.text || "");
+  if (text.length <= SNAPSHOT_MESSAGE_TEXT_LIMIT) return { ...message };
+  return {
+    ...message,
+    text: `${text.slice(0, SNAPSHOT_MESSAGE_TEXT_LIMIT)}\n... ${text.length - SNAPSHOT_MESSAGE_TEXT_LIMIT} characters omitted from snapshot`,
+    fullTextOmitted: true,
+    fullTextLength: text.length,
+  };
+}
+
 function buildConversationTranscript(messages) {
   return (messages || [])
     .filter((entry) => !["provider-activity", "provider-tool", "provider-error"].includes(entry.role))

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

@@ -3,10 +3,11 @@ 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";
+import { formatQualitySignalText, fitQualitySignal } from "./quality-signal-strip.mjs";
 
 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] || ""]
+  const lines = [view.title, view.welcome.rows.find(([label]) => label === "Provider")?.[1] || "", formatQualitySignalText(fitQualitySignal(view.qualitySignal, { width }))]
     .filter(Boolean);
   for (const block of view.blocks || []) {
     lines.push("");