@elench/testkit 0.1.110 → 0.1.112

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/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

@@ -11,6 +11,7 @@ export async function runAssistantConversationTurn({
   userMessage,
   provider = "auto",
   settings = null,
+  turnId = null,
   env = process.env,
   configs,
   commandLog,
@@ -24,6 +25,7 @@ export async function runAssistantConversationTurn({
     productDir,
     runState,
     commandLog,
+    turnId,
     onEvent: onToolEvent,
   });
 
@@ -38,12 +40,13 @@ export async function runAssistantConversationTurn({
 
   const runtimeSettings = settings || { provider };
   const resolvedProvider = resolvePreferredProvider(runtimeSettings.provider || provider, env);
-  const providerEnv = commandLog?.providerEnv?.(env) || env;
+  const providerEnv = commandLog?.providerEnv?.(env, { turnId }) || 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 +70,7 @@ export async function runAssistantConversationTurn({
       model: runtimeSettings.model || null,
       effort: runtimeSettings.effort || null,
       providerArgs: runtimeSettings.providerArgs || [],
+      timeoutMs,
       cwd: productDir,
       prompt,
       purpose: "assistant",
@@ -91,6 +95,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

@@ -17,6 +17,7 @@ import { parseSlashCommand, formatSlashHelpLines } from "./slash-commands.mjs";
 import { executeAssistantAction } from "./actions.mjs";
 import { runAssistantConversationTurn } from "./session.mjs";
 import { prepareAssistantContextPack } from "./context-pack.mjs";
+import { normalizeCommandLine, unwrapShellCommand } from "./command-normalize.mjs";
 import {
   discoverAssistantModels,
   formatModelChoices,
@@ -41,6 +42,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 +65,7 @@ export function createAssistantState({
 
   const listeners = new Set();
   const messages = [];
+  const diagnostics = [];
   let composerState = createComposerState();
   let notice = null;
   let busy = false;
@@ -84,6 +88,8 @@ export function createAssistantState({
   if (sanitizedStartup.notice) notice = sanitizedStartup.notice;
   let activeStatus = null;
   let startupNoticeEmitted = false;
+  let lastTurnError = null;
+  let activeTurn = idleTurn();
   let contextUsage = buildContextUsage({
     provider: resolvedProviderName || settings.provider,
     model: settings.model,
@@ -105,6 +111,7 @@ export function createAssistantState({
   function appendMessage(message) {
     const entry = {
       id: `msg-${messages.length + 1}`,
+      ...(activeTurn?.id && !message.turnId ? { turnId: activeTurn.id } : {}),
       ...message,
     };
     messages.push(entry);
@@ -130,6 +137,14 @@ export function createAssistantState({
     notify();
   }
 
+  function appendDiagnostic(diagnostic) {
+    diagnostics.push({
+      timestamp: new Date().toISOString(),
+      ...diagnostic,
+    });
+    notify();
+  }
+
   function refreshContextPack() {
     commandLog.refresh();
   }
@@ -170,6 +185,7 @@ export function createAssistantState({
     commandLog,
     attachRunSession,
     completeRunSession,
+    updateMessage,
 
     async loadLatestArtifact() {
       try {
@@ -334,11 +350,26 @@ 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 });
       }
-      appendMessage({ role: "user", text: trimmed });
+      const turnId = createAssistantTurnId();
+      appendMessage({ role: "user", text: trimmed, turnId });
 
       const slash = parseSlashCommandSafe(trimmed);
       if (slash?.type === "__error__") {
@@ -347,6 +378,8 @@ export function createAssistantState({
       }
       if (slash) {
         try {
+          activeTurn = { id: turnId, state: "slash_running", input: trimmed, startedAt: new Date().toISOString() };
+          commandLog.setActiveTurnId?.(turnId);
           setBusy(true, `Running ${slash.type}...`);
           await executeSlashCommand({
             slash,
@@ -363,6 +396,14 @@ export function createAssistantState({
             text: error instanceof Error ? error.message : String(error),
           });
         } finally {
+          commandLog.setActiveTurnId?.(null);
+          activeTurn = {
+            id: turnId,
+            state: "idle",
+            input: trimmed,
+            startedAt: activeTurn?.startedAt || new Date().toISOString(),
+            finishedAt: new Date().toISOString(),
+          };
           setBusy(false, null);
         }
         refreshContextPack();
@@ -371,6 +412,8 @@ export function createAssistantState({
       }
 
       try {
+        activeTurn = { id: turnId, state: "provider_running", input: trimmed, startedAt: new Date().toISOString() };
+        commandLog.setActiveTurnId?.(turnId);
         setBusy(true, `Thinking with ${settings.provider === "auto" ? "provider" : settings.provider}...`);
         const providerTurn = createProviderTurnState();
         await runAssistantConversationTurn({
@@ -379,6 +422,7 @@ export function createAssistantState({
           transcript: buildConversationTranscript(messages),
           userMessage: trimmed,
           settings,
+          turnId,
           env,
           configs,
           commandLog,
@@ -413,12 +457,34 @@ 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,
         });
+        activeTurn = {
+          id: turnId,
+          state: "failed",
+          input: trimmed,
+          startedAt: activeTurn?.startedAt || new Date().toISOString(),
+          failedAt: new Date().toISOString(),
+          error: lastTurnError,
+        };
       } finally {
+        commandLog.setActiveTurnId?.(null);
         refreshContextPack();
+        if (activeTurn?.id === turnId && activeTurn.state !== "failed") {
+          activeTurn = {
+            id: turnId,
+            state: "idle",
+            input: trimmed,
+            startedAt: activeTurn?.startedAt || new Date().toISOString(),
+            finishedAt: new Date().toISOString(),
+          };
+        }
         setBusy(false, null);
       }
     },
@@ -429,11 +495,13 @@ export function createAssistantState({
     },
 
     getSnapshot() {
+      const snapshotMessages = messages.map(serializeMessageForSnapshot);
       return {
         context: buildContextSelection(runState.getSnapshot()),
         run: runState.getSnapshot(),
         productDir,
-        messages: [...messages],
+        messages: snapshotMessages,
+        activities: buildSnapshotActivities(snapshotMessages),
         composer: composerState.text,
         composerCursor: composerState.cursor,
         notice,
@@ -445,15 +513,24 @@ export function createAssistantState({
         providerArgs: [...settings.providerArgs],
         cliConfig,
         activeStatus,
+        turn: activeTurn,
+        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,
         },
       };
     },
@@ -470,6 +547,17 @@ function resolveInitialProvider(provider, env) {
   return null;
 }
 
+function idleTurn() {
+  return {
+    id: null,
+    state: "idle",
+  };
+}
+
+function createAssistantTurnId(now = Date.now(), random = Math.random) {
+  return `turn-${now}-${random().toString(36).slice(2, 10)}`;
+}
+
 async function executeSlashCommand({
   slash,
   state,
@@ -626,6 +714,7 @@ function handleAssistantToolEvent(state, event, appendMessage) {
     return;
   }
   if (event.type === "observed-testkit-command") {
+    suppressMatchingProviderCommand(state, event.command);
     appendMessage({
       role: "tool",
       toolName: event.command?.kind || "testkit",
@@ -641,6 +730,28 @@ function handleAssistantToolEvent(state, event, appendMessage) {
   }
 }
 
+function suppressMatchingProviderCommand(state, command) {
+  const observed = normalizeCommandLine(formatObservedCommandLine(command));
+  if (!observed) return;
+  const snapshot = state.getSnapshot();
+  for (const message of snapshot.messages || []) {
+    if (message.role !== "provider-tool") continue;
+    const providerCommand = normalizeCommandLine(providerToolCommandLine(message.data));
+    if (!providerCommand || providerCommand !== observed) continue;
+    state.updateMessage?.(message.id, (current) => ({
+      data: {
+        ...(current.data || {}),
+        supersededByTestkitCommand: command?.commandId || true,
+      },
+    }));
+  }
+}
+
+function providerToolCommandLine(event) {
+  if (!event) return null;
+  return event.input || event.data?.command || event.data?.input || null;
+}
+
 function createProviderTurnState() {
   return {
     assistantMessageId: null,
@@ -891,6 +1002,51 @@ 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 buildSnapshotActivities(messages) {
+  return (messages || []).map((message) => {
+    const base = {
+      id: message.id,
+      turnId: message.turnId || null,
+      title: message.title || null,
+      text: message.text || "",
+      status: message.status || null,
+      data: message.data || null,
+    };
+    if (message.role === "user") return { ...base, kind: "user_message" };
+    if (message.role === "assistant") return { ...base, kind: "assistant_message" };
+    if (message.role === "provider-tool") {
+      return {
+        ...base,
+        kind: "provider_command",
+        command: providerToolCommandLine(message.data),
+        supersededBy: message.data?.supersededByTestkitCommand || null,
+      };
+    }
+    if (message.role === "provider-activity") return { ...base, kind: "provider_status" };
+    if (message.role === "tool" && message.data?.testkitRelated) {
+      const kind = message.data?.kind === "run" ? "testkit_run" : "testkit_command";
+      return {
+        ...base,
+        kind,
+        command: message.data?.command || null,
+        commandId: message.data?.commandId || null,
+      };
+    }
+    return { ...base, kind: "system_message" };
+  });
+}
+
 function buildConversationTranscript(messages) {
   return (messages || [])
     .filter((entry) => !["provider-activity", "provider-tool", "provider-error"].includes(entry.role))

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

@@ -1,5 +1,6 @@
 import path from "path";
 import { formatContextRemaining } from "./context-window.mjs";
+import { normalizeCommandLine, unwrapShellCommand } from "./command-normalize.mjs";
 
 const PROVIDER_COMMAND_OUTPUT_PREVIEW_LINES = 12;
 const PROVIDER_FILE_READ_OUTPUT_PREVIEW_LINES = 8;
@@ -13,7 +14,7 @@ export function buildAssistantViewModel(snapshot, { cwd = process.cwd(), termina
     title: `testkit · ${repoName}`,
     welcome: buildWelcomeModel(snapshot, { cwd, providerLabel }),
     qualitySignal: buildQualitySignal(snapshot),
-    blocks: buildTranscriptBlocks(snapshot.messages || []),
+    blocks: snapshot.activities ? buildActivityBlocks(snapshot.activities) : buildTranscriptBlocks(snapshot.messages || []),
     composer: {
       text: snapshot.composer || "",
       cursor: snapshot.composerCursor ?? 0,
@@ -134,7 +135,8 @@ export function buildWelcomeModel(snapshot, { cwd = process.cwd(), providerLabel
 }
 
 export function buildTranscriptBlocks(messages) {
-  return (messages || []).map((message) => {
+  const visibleMessages = filterSupersededProviderCommands(messages || []);
+  return visibleMessages.map((message) => {
     const role = message.role || "system";
     if (role === "tool") {
       const outputPreview = summarizeOutput(message.text || "", TESTKIT_COMMAND_OUTPUT_PREVIEW_LINES);
@@ -204,6 +206,71 @@ export function buildTranscriptBlocks(messages) {
   });
 }
 
+export function buildActivityBlocks(activities) {
+  const messages = (activities || [])
+    .filter((activity) => !activity.supersededBy)
+    .map((activity) => {
+      if (activity.kind === "user_message") return { id: activity.id, role: "user", text: activity.text || "" };
+      if (activity.kind === "assistant_message") return { id: activity.id, role: "assistant", text: activity.text || "" };
+      if (activity.kind === "provider_command") {
+        return {
+          id: activity.id,
+          role: "provider-tool",
+          title: activity.title || "provider command",
+          text: activity.text || "",
+          status: activity.status || null,
+          data: {
+            ...(activity.data || {}),
+            input: activity.command || activity.data?.input || null,
+          },
+        };
+      }
+      if (activity.kind === "provider_status") {
+        return {
+          id: activity.id,
+          role: "provider-activity",
+          title: activity.title || null,
+          text: activity.text || "",
+          status: activity.status || null,
+        };
+      }
+      if (activity.kind === "testkit_command" || activity.kind === "testkit_run") {
+        return {
+          id: activity.id,
+          role: "tool",
+          title: activity.title || (activity.kind === "testkit_run" ? "testkit run" : "testkit command"),
+          text: activity.text || "",
+          status: activity.status || null,
+          data: {
+            ...(activity.data || {}),
+            testkitRelated: true,
+            kind: activity.kind === "testkit_run" ? "run" : activity.data?.kind,
+            command: activity.command || activity.data?.command || null,
+            commandId: activity.commandId || activity.data?.commandId || null,
+          },
+        };
+      }
+      return { id: activity.id, role: "system", title: activity.title || null, text: activity.text || "" };
+    });
+  return buildTranscriptBlocks(messages);
+}
+
+function filterSupersededProviderCommands(messages) {
+  const observedCommands = new Set(
+    (messages || [])
+      .filter((message) => message.role === "tool" && message.data?.testkitRelated)
+      .map((message) => normalizeCommandLine(message.data?.command))
+      .filter(Boolean)
+  );
+  return (messages || []).filter((message) => {
+    if (message.role !== "provider-tool") return true;
+    if (message.data?.supersededByTestkitCommand) return false;
+    const providerCommand = normalizeCommandLine(message.data?.input || message.data?.data?.command || message.data?.data?.input);
+    if (!providerCommand) return true;
+    return !observedCommands.has(providerCommand);
+  });
+}
+
 export function buildStatusLine(snapshot, { cwd = process.cwd(), providerLabel = null } = {}) {
   const context = formatContextRemaining(snapshot.contextUsage);
   const provider = providerLabel || buildProviderLabel(snapshot);
@@ -339,13 +406,6 @@ function isDiffProducingShellCommand(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) {
   if (value == null) return "";
   if (typeof value === "string") return value;

package/lib/cli/commands/assistant.mjs

@@ -95,6 +95,9 @@ export default class AssistantCommand extends Command {
           this.log(`${message.role}: ${message.text}`);
         }
       }
+      if (snapshot.lastTurnError?.kind === "provider") {
+        process.exitCode = 1;
+      }
       return snapshot;
     }
 

package/lib/cli/commands/run.mjs

@@ -14,7 +14,7 @@ export default class RunCommand extends Command {
     type: Args.string({
       description: `Optional suite type shortcut: ${publicTestTypeListText({ includeAll: true })}`,
       required: false,
-      options: publicTestTypeList({ includeAll: true, includeLegacy: true }),
+      options: publicTestTypeList({ includeAll: true }),
     }),
   };
 

package/lib/cli/components/blocks/run-tree.mjs

@@ -25,8 +25,9 @@ export function RunTreeView({
   interactive = true,
 } = {}) {
   const { exit } = useApp();
+  const controlledSnapshot = Boolean(snapshotOverride);
   const [snapshot, setSnapshot] = useState(() => snapshotOverride || runState.getSnapshot());
-  const { frame } = useAnimation({ interval: 80, isActive: !snapshot.finished });
+  const { frame } = useAnimation({ interval: 80, isActive: !controlledSnapshot && !snapshot.finished });
   const spinnerFrame = SPINNER_FRAMES[frame % SPINNER_FRAMES.length];
 
   useEffect(() => {

package/lib/cli/entrypoint.mjs

@@ -16,7 +16,7 @@ export function normalizeCliArgs(argv) {
     "browser",
     "db",
   ]);
-  const runTypeShortcuts = new Set(publicTestTypeList({ includeAll: true, includeLegacy: true }));
+  const runTypeShortcuts = new Set(publicTestTypeList({ includeAll: true }));
   const valueFlags = new Set([
     "--dir",
     "--service",

package/lib/config/discovery.mjs

@@ -16,7 +16,6 @@ const DISCOVERY_RULES = [
   { suffix: ".dal.testkit.ts", type: "dal", framework: "k6" },
   { suffix: ".load.testkit.ts", type: "load", framework: "k6" },
   { suffix: ".ui.testkit.ts", type: "ui", framework: "playwright" },
-  { suffix: ".pw.testkit.ts", type: "ui", framework: "playwright", legacySuffix: true },
 ];
 
 export function discoverProject(productDir, explicitServices = {}, options = {}) {
@@ -31,15 +30,6 @@ export function discoverProject(productDir, explicitServices = {}, options = {})
   for (const filePath of suiteFiles) {
     const rule = inferRule(filePath);
     if (!rule) continue;
-    if (rule.legacySuffix) {
-      diagnostics.push({
-        code: "legacy_ui_suffix",
-        severity: "warning",
-        message: `Legacy UI test suffix ".pw.testkit.ts" is deprecated. Rename to ".ui.testkit.ts": ${filePath}`,
-        path: filePath,
-      });
-    }
-
     const owners = inferOwners(filePath, explicitServices, repoDiscovery);
     if (owners === null) continue;
     if (owners.length === 0) {

package/lib/discovery/index.mjs

@@ -489,7 +489,7 @@ function normalizePath(filePath) {
 export function fileDisplayName(filePath) {
   const base = path.posix
     .basename(filePath)
-    .replace(/(\.int|\.e2e|\.scenario|\.dal|\.load|\.ui|\.pw)\.testkit\.ts$/, "");
+    .replace(/(\.int|\.e2e|\.scenario|\.dal|\.load|\.ui)\.testkit\.ts$/, "");
   return formatDisplayName(base);
 }