e2e 0.16.0 → 0.18.0

package/dist/oauth/providers/github-copilot.js

@@ -92,31 +92,46 @@ export async function sendCopilotRequest(request, credentials, upstream) {
         url.host = new URL(copilotBaseUrl(credentials.enterpriseUrl)).host;
     const headers = new Headers(request.headers);
     headers.set('openai-intent', 'conversation-edits');
-    let initiator = 'user';
-    let vision = false;
     const text = request.method === 'POST' ? await request.text() : undefined;
-    if (text !== undefined) {
-        try {
-            const body = JSON.parse(text);
-            const messages = Array.isArray(body.messages) ? body.messages : [];
-            if (messages.at(-1)?.role !== 'user')
-                initiator = 'agent';
-            vision = messages.some((message) => Array.isArray(message.content) && message.content.some((part) => part?.type === 'image_url'));
-        }
-        catch {
-            // Not JSON; the headers stay at their defaults.
-        }
-    }
-    headers.set('x-initiator', initiator);
-    if (vision)
+    const turn = copilotTurn(text);
+    headers.set('x-initiator', turn.initiator);
+    if (turn.vision)
         headers.set('copilot-vision-request', 'true');
     return upstream(new Request(url, { method: request.method, headers, signal: request.signal, ...(text === undefined ? {} : { body: text }) }));
 }
+/**
+ * Reads who initiated the turn and whether images are present, whichever
+ * protocol carried the body. Chat completions put turns in `messages[]` and
+ * images in `image_url` parts; the Responses API puts them in `input[]` with
+ * `input_image`. A body shaped like neither keeps the defaults.
+ */
+function copilotTurn(text) {
+    if (text === undefined)
+        return { initiator: 'user', vision: false };
+    try {
+        const body = JSON.parse(text);
+        // A Responses body has `input` and no `messages`; anything else stays on the chat path.
+        if (!Array.isArray(body.messages) && Array.isArray(body.input)) {
+            const input = body.input;
+            return { initiator: input.at(-1)?.role === 'user' ? 'user' : 'agent', vision: input.some((item) => hasPart(item.content, 'input_image')) };
+        }
+        const messages = Array.isArray(body.messages) ? body.messages : [];
+        return { initiator: messages.at(-1)?.role === 'user' ? 'user' : 'agent', vision: messages.some((message) => hasPart(message.content, 'image_url')) };
+    }
+    catch {
+        // Not JSON; the headers stay at their defaults.
+        return { initiator: 'user', vision: false };
+    }
+}
+/** Whether a turn's content carries a part of the given type (`image_url` for chat, `input_image` for Responses). */
+function hasPart(content, type) {
+    return Array.isArray(content) && content.some((part) => part?.type === type);
+}
 /**
  * The chat models the Copilot plan serves; embeddings and other kinds are
- * left out because only chat models fit `copilot()`. A model the plan has
- * not enabled, or one Copilot serves without `/chat/completions`, is listed
- * but marked: `copilot()` posts to `/chat/completions`, which rejects both. The
+ * left out because only chat models fit `copilot()`. A model it cannot call
+ * at all is listed but marked: one the plan has not enabled, or one Copilot
+ * serves only over APIs `copilot()` does not speak (such as Messages). The
  * request goes through `send`, so an enterprise login lists its own host.
  */
 async function listCopilotModels(fetch) {
@@ -135,7 +150,7 @@ async function listCopilotModels(fetch) {
             supports?.vision === true ? 'vision' : undefined,
             model.preview === true ? 'preview' : undefined,
             typeof model.policy?.state === 'string' && model.policy.state !== 'enabled' ? 'not enabled' : undefined,
-            servesChatCompletions(model) ? undefined : 'no chat completions',
+            copilotProtocol(model) === undefined ? 'no chat or responses' : undefined,
         ].filter((part) => part !== undefined);
         return {
             id: model.id,
@@ -144,7 +159,46 @@ async function listCopilotModels(fetch) {
         };
     });
 }
-/** Whether `copilot()` can reach the model; an entry that names no endpoints is served over chat completions. */
-function servesChatCompletions(model) {
-    return !Array.isArray(model.supported_endpoints) || model.supported_endpoints.includes('/chat/completions');
+/**
+ * Which endpoint `copilot()` reaches `modelId` on, read from the Copilot
+ * API's `GET /models`, or `undefined` when the listing could not be read
+ * (an error status, a body that is not JSON, the network, the signal), so
+ * the caller can ask again instead of remembering a guess. A model the
+ * listing does not name, or names with no endpoint `copilot()` speaks, is
+ * chat: the vendor's own error then explains it. A rejected login is not a
+ * missing listing and rejects.
+ */
+export async function copilotProtocolFor(modelId, fetch, signal) {
+    try {
+        const response = await fetch(new Request(`${COPILOT_API_URL}/models`, { signal }));
+        if (!response.ok)
+            return undefined;
+        const payload = (await response.json());
+        if (!Array.isArray(payload.data))
+            return undefined;
+        return copilotProtocol(payload.data.find((model) => model.id === modelId)) ?? 'chat';
+    }
+    catch (error) {
+        if (error instanceof OAuthError)
+            throw error;
+        return undefined;
+    }
+}
+/**
+ * The protocol one `/models` entry is served on, or `undefined` when
+ * `copilot()` cannot call it. An entry that names no endpoints is chat, as
+ * Copilot's older models are; chat completions wins when both are named, so
+ * a model that worked over chat keeps doing so. Whether the plan enabled the
+ * model is a separate question: Copilot rejects a disabled model the same
+ * way on either endpoint.
+ */
+function copilotProtocol(model) {
+    const endpoints = model?.supported_endpoints;
+    if (model === undefined || !Array.isArray(endpoints))
+        return 'chat';
+    if (endpoints.includes('/chat/completions'))
+        return 'chat';
+    if (endpoints.includes('/responses'))
+        return 'responses';
+    return undefined;
 }

package/dist/oauth/providers/opencode-console.d.ts

@@ -0,0 +1,31 @@
+/**
+ * OpenCode Zen and Go through an OpenCode Console sign-in. Console speaks RFC
+ * 8628 device authorization; approving the code binds the login to one
+ * workspace, and its token is a bearer for both the Console API and inference.
+ * Refresh tokens rotate. The workspace config says which models are served and
+ * over which protocol: Zen is its `opencode` provider, Go `opencode-go`, present
+ * only for the Go subscriber. Go ids take a `go/` prefix here.
+ */
+import type { FetchFunction, OAuthCredentials, OAuthProvider } from '../types.ts';
+export interface OpencodeConsoleCredentials extends OAuthCredentials {
+    /** The workspace the login is bound to; absent for a service API key. */
+    readonly orgId?: string;
+}
+export interface OpencodeConsoleProviderOptions {
+    /** Test seam. */
+    readonly consoleUrl?: string;
+}
+export declare function createOpencodeConsoleProvider(options?: OpencodeConsoleProviderOptions): OAuthProvider<OpencodeConsoleCredentials, Record<string, never>>;
+export interface OpencodeConsoleRoute {
+    readonly go: boolean;
+    readonly npm: string;
+    readonly baseURL: string;
+    readonly modelId: string;
+}
+/** The plan's chat completions route, used until the config is read. */
+export declare function opencodeConsoleChatRoute(modelId: string): OpencodeConsoleRoute;
+/**
+ * The model's route from the workspace config, or `undefined` when the config
+ * could not be read, so the caller asks again rather than remembering a guess.
+ */
+export declare function opencodeConsoleRouteFor(modelId: string, fetch: FetchFunction, signal: AbortSignal): Promise<OpencodeConsoleRoute | undefined>;

package/dist/oauth/providers/opencode-console.js

@@ -0,0 +1,148 @@
+/**
+ * OpenCode Zen and Go through an OpenCode Console sign-in. Console speaks RFC
+ * 8628 device authorization; approving the code binds the login to one
+ * workspace, and its token is a bearer for both the Console API and inference.
+ * Refresh tokens rotate. The workspace config says which models are served and
+ * over which protocol: Zen is its `opencode` provider, Go `opencode-go`, present
+ * only for the Go subscriber. Go ids take a `go/` prefix here.
+ */
+import { rfc8628Flow } from '../device-code.js';
+import { OAuthError, describeResponse } from '../errors.js';
+import { expiryFrom, requestTokens } from '../token-endpoint.js';
+/** Console accepts any client id. */
+const CLIENT_ID = 'e2e';
+const CONSOLE_URL = 'https://opencode.ai/console';
+const INFERENCE_URL = 'https://opencode.ai/inference';
+const GO_PREFIX = 'go/';
+const ZEN_PROVIDER = 'opencode';
+const GO_PROVIDER = 'opencode-go';
+export function createOpencodeConsoleProvider(options = {}) {
+    const consoleUrl = options.consoleUrl ?? CONSOLE_URL;
+    const tokenUrl = `${consoleUrl}/auth/device/token`;
+    return {
+        id: 'opencode-console',
+        name: 'OpenCode Console',
+        async login(callbacks) {
+            const deviceCodeUrl = `${consoleUrl}/auth/device/code`;
+            const tokens = await rfc8628Flow({
+                vendor: 'OpenCode Console',
+                deviceCodeUrl,
+                tokenUrl,
+                clientId: CLIENT_ID,
+                request: { supports_org_scope: 'true' },
+                // Console answers with a relative verification URL.
+                callbacks: {
+                    ...callbacks,
+                    onAuth: (info) => {
+                        const url = new URL(info.url, deviceCodeUrl).href;
+                        callbacks.onAuth({
+                            ...info,
+                            url,
+                            instructions: `Open ${url} on any device, pick the workspace to sign in to${info.userCode === undefined ? '' : `, and confirm the code ${info.userCode}`}.`,
+                        });
+                    },
+                },
+            });
+            return toCredentials(tokens);
+        },
+        async refresh(credentials) {
+            if (credentials.refresh === '')
+                throw new OAuthError('LOGIN_REQUIRED', 'OpenCode Console has no refresh token for this login');
+            const tokens = await requestTokens('OpenCode Console', tokenUrl, { grant_type: 'refresh_token', refresh_token: credentials.refresh, client_id: CLIENT_ID }, 'LOGIN_REQUIRED');
+            return toCredentials(tokens, credentials);
+        },
+        send(request, credentials, upstream) {
+            return sendOpencodeConsoleRequest(request, credentials, upstream, consoleUrl);
+        },
+        models(fetch) {
+            return listOpencodeConsoleModels(fetch, consoleUrl);
+        },
+    };
+}
+/** Names the workspace as each API expects, and drops the Google SDK's placeholder key header. */
+async function sendOpencodeConsoleRequest(request, credentials, upstream, consoleUrl) {
+    const headers = new Headers(request.headers);
+    headers.delete('x-goog-api-key');
+    if (credentials.orgId !== undefined)
+        headers.set(request.url.startsWith(`${consoleUrl}/`) ? 'x-org-id' : 'x-opencode-org-id', credentials.orgId);
+    const body = request.method === 'GET' || request.method === 'HEAD' ? undefined : await request.arrayBuffer();
+    return upstream(new Request(request.url, { method: request.method, headers, signal: request.signal, ...(body === undefined ? {} : { body }) }));
+}
+async function readConfig(fetch, consoleUrl, signal) {
+    const response = await fetch(new Request(`${consoleUrl}/api/config`, signal === undefined ? {} : { signal }));
+    if (!response.ok)
+        throw new OAuthError('FLOW_FAILED', `OpenCode Console did not return the workspace config: ${await describeResponse(response)}`);
+    const payload = (await response.json());
+    const providers = payload.config?.provider;
+    return typeof providers === 'object' && providers !== null ? providers : {};
+}
+/** Leaves out disabled models and Zen's free ones, which only OpenCode's own clients may use. */
+async function listOpencodeConsoleModels(fetch, consoleUrl) {
+    const providers = await readConfig(fetch, consoleUrl);
+    const listed = (key, prefix, plan) => Object.entries(providers[key]?.models ?? {})
+        .filter(([, model]) => model.disabled !== true && (key === GO_PROVIDER || !isFree(model)))
+        .map(([id, model]) => {
+        const detail = [
+            plan,
+            typeof model.cost?.input === 'number' && typeof model.cost.output === 'number' && key === ZEN_PROVIDER ? `$${model.cost.input} in, $${model.cost.output} out per 1M` : undefined,
+            Array.isArray(model.modalities?.input) && model.modalities.input.includes('image') ? 'vision' : undefined,
+        ].filter((part) => part !== undefined);
+        return { id: `${prefix}${id}`, ...(typeof model.name === 'string' && model.name !== '' ? { name: model.name } : {}), detail: detail.join(', ') };
+    });
+    return [...listed(ZEN_PROVIDER, '', 'Zen'), ...listed(GO_PROVIDER, GO_PREFIX, 'Go')];
+}
+function isFree(model) {
+    return model.cost?.input === 0 && model.cost.output === 0;
+}
+const CHAT_NPM = '@ai-sdk/openai-compatible';
+function splitModelId(modelId) {
+    const go = modelId.startsWith(GO_PREFIX);
+    return { go, id: go ? modelId.slice(GO_PREFIX.length) : modelId };
+}
+/** The plan's chat completions route, used until the config is read. */
+export function opencodeConsoleChatRoute(modelId) {
+    const { go, id } = splitModelId(modelId);
+    return { go, npm: CHAT_NPM, baseURL: `${INFERENCE_URL}${go ? '/go' : ''}/openai/v1`, modelId: id };
+}
+/**
+ * The model's route from the workspace config, or `undefined` when the config
+ * could not be read, so the caller asks again rather than remembering a guess.
+ */
+export async function opencodeConsoleRouteFor(modelId, fetch, signal) {
+    let providers;
+    try {
+        providers = await readConfig(fetch, CONSOLE_URL, signal);
+    }
+    catch (error) {
+        if (error instanceof OAuthError && error.code !== 'FLOW_FAILED')
+            throw error;
+        return undefined;
+    }
+    const { go, id } = splitModelId(modelId);
+    const provider = providers[go ? GO_PROVIDER : ZEN_PROVIDER];
+    if (provider === undefined) {
+        throw new OAuthError('MISCONFIGURED', go
+            ? 'OpenCode Go is not available to this login: the workspace has no Go subscription, or the signed-in user is not its subscriber; sign in to the Go workspace with `npx e2e login opencode-console`'
+            : 'OpenCode Zen is turned off for this OpenCode Console workspace');
+    }
+    const model = provider.models?.[id];
+    if (model === undefined || model.disabled === true) {
+        throw new OAuthError('MISCONFIGURED', `the OpenCode Console workspace does not serve ${modelId}; \`npx e2e models opencode-console\` lists the ids`);
+    }
+    const npm = typeof model.provider?.npm === 'string' ? model.provider.npm : provider.npm;
+    const baseURL = typeof model.provider?.api === 'string' ? model.provider.api : provider.api;
+    if (typeof npm !== 'string' || typeof baseURL !== 'string')
+        return undefined;
+    return { go, npm, baseURL, modelId: typeof model.id === 'string' && model.id !== '' ? model.id : id };
+}
+/** A refresh keeps the workspace and the refresh token when the grant omits them. */
+function toCredentials(tokens, previous) {
+    const orgId = tokens.org_id;
+    const workspace = typeof orgId === 'string' && orgId !== '' ? orgId : previous?.orgId;
+    return {
+        access: tokens.access_token,
+        refresh: tokens.refresh_token ?? previous?.refresh ?? '',
+        expires: expiryFrom(tokens.expires_in),
+        ...(workspace === undefined ? {} : { orgId: workspace }),
+    };
+}

package/dist/oauth/providers.d.ts

@@ -5,16 +5,12 @@ import type { OAuthProvider } from './types.ts';
 export interface LoginOptionsById {
     readonly openai: CodexLoginOptions;
     readonly 'github-copilot': CopilotLoginOptions;
+    readonly 'opencode-console': Record<string, never>;
     readonly spacexai: Record<string, never>;
 }
 export type ProviderId = keyof LoginOptionsById;
-export declare const PROVIDER_IDS: readonly ["openai", "github-copilot", "spacexai"];
+export declare const PROVIDER_IDS: readonly ["openai", "github-copilot", "opencode-console", "spacexai"];
 export declare function isProviderId(id: string): id is ProviderId;
 export declare function getProvider(id: ProviderId): OAuthProvider;
-/**
- * How requests identify this harness to a vendor: `e2e/<version> (<platform>; <arch>)`,
- * alongside the `originator` (ChatGPT) and `referrer` (SpaceXAI) the flows send. Never another client's name.
- */
-export declare const USER_AGENT: string;
 /** How a missing login is described to the user: the CLI command that fixes it. */
 export declare function loginHint(id: ProviderId): string;

package/dist/oauth/providers.js

@@ -1,13 +1,14 @@
 /** The built-in providers by id, and the login options each one takes. */
-import { packageVersion } from '../internal/package-version.js';
 import { createCodexProvider } from './providers/openai.js';
 import { createCopilotProvider } from './providers/github-copilot.js';
+import { createOpencodeConsoleProvider } from './providers/opencode-console.js';
 import { createXaiProvider } from './providers/xai.js';
-export const PROVIDER_IDS = ['openai', 'github-copilot', 'spacexai'];
+export const PROVIDER_IDS = ['openai', 'github-copilot', 'opencode-console', 'spacexai'];
 // Method shorthand is bivariant, so each specialised provider fits the base interface without a cast.
 const PROVIDERS = {
     openai: createCodexProvider(),
     'github-copilot': createCopilotProvider(),
+    'opencode-console': createOpencodeConsoleProvider(),
     spacexai: createXaiProvider(),
 };
 export function isProviderId(id) {
@@ -16,11 +17,6 @@ export function isProviderId(id) {
 export function getProvider(id) {
     return PROVIDERS[id];
 }
-/**
- * How requests identify this harness to a vendor: `e2e/<version> (<platform>; <arch>)`,
- * alongside the `originator` (ChatGPT) and `referrer` (SpaceXAI) the flows send. Never another client's name.
- */
-export const USER_AGENT = `e2e/${packageVersion(import.meta.url, '../../package.json', '0.0.0')} (${process.platform}; ${process.arch})`;
 /** How a missing login is described to the user: the CLI command that fixes it. */
 export function loginHint(id) {
     return `run \`npx e2e login ${id}\``;

package/dist/oauth/responses.d.ts

@@ -0,0 +1,9 @@
+/** Helpers shared by the subscription models that ride the Responses API. */
+import type { LanguageModelV4 } from '@ai-sdk/provider';
+/**
+ * Tells the SDK what a subscription backend enforces: nothing is stored
+ * server side. Believing storage is on, the SDK refers back to an earlier
+ * turn's reasoning by id (`item_reference`), which the backend then cannot
+ * find; told it is off, the SDK carries the encrypted reasoning itself.
+ */
+export declare function withoutServerStorage(model: LanguageModelV4): LanguageModelV4;

package/dist/oauth/responses.js

@@ -0,0 +1,23 @@
+/** Helpers shared by the subscription models that ride the Responses API. */
+/**
+ * Tells the SDK what a subscription backend enforces: nothing is stored
+ * server side. Believing storage is on, the SDK refers back to an earlier
+ * turn's reasoning by id (`item_reference`), which the backend then cannot
+ * find; told it is off, the SDK carries the encrypted reasoning itself.
+ */
+export function withoutServerStorage(model) {
+    const storeOff = (options) => ({
+        ...options,
+        providerOptions: { ...options.providerOptions, openai: { ...options.providerOptions?.['openai'], store: false } },
+    });
+    return {
+        specificationVersion: model.specificationVersion,
+        provider: model.provider,
+        modelId: model.modelId,
+        get supportedUrls() {
+            return model.supportedUrls;
+        },
+        doGenerate: (options) => model.doGenerate(storeOff(options)),
+        doStream: (options) => model.doStream(storeOff(options)),
+    };
+}

package/dist/report/build.d.ts

@@ -264,15 +264,36 @@ export interface ReportUsage {
     maxActionStepsInStep: number;
     estimatedCostUsd?: number;
 }
+/**
+ * The run's counts by result. `passed`, `failed` (timed out included),
+ * `interrupted`, `flaky`, and `skipped` count selected results only and add
+ * up to `selected`; `discovered` minus `selected` is what the selection left
+ * out.
+ */
 export interface ReportSummary {
     discovered: number;
     selected: number;
     executed: number;
     passed: number;
     failed: number;
+    /** Stopped by the run (a signal, `--max-failures`, a run-level error) before reaching a verdict; never counted as failed. */
+    interrupted: number;
     flaky: number;
     skipped: number;
 }
+/**
+ * What earlier runs left unresolved that a `--last-failed` rerun did not run
+ * again, because another filter left it out: the results as those runs
+ * reported them, the serial groups their members' attempts live on, and the
+ * suite hook failures whose scope still holds a carried test. The next
+ * `--last-failed` selects these tests too, so a test that never ran again
+ * stays owed until it does.
+ */
+export interface ReportCarried {
+    results: readonly ReportResult[];
+    serialGroups: readonly ReportSerialGroup[];
+    errors: readonly ReportError[];
+}
 export interface Report1Document {
     schemaVersion: 'report-1';
     run: {
@@ -309,6 +330,11 @@ export interface Report1Document {
         summary: ReportSummary;
         limits: ReportLimits;
         usage: ReportUsage;
+        /**
+         * Present on a `--last-failed` rerun that left out a test an earlier run
+         * did not pass. Not part of this run's status, exit code, or summary.
+         */
+        carried?: ReportCarried | undefined;
         /** Present on an `e2e explore` run only. */
         explore?: ReportExplore | undefined;
     };

package/dist/report/build.js

@@ -8,6 +8,7 @@ import { resultId, timestamp } from '../internal/ids.js';
 import { obj } from '../internal/objects.js';
 import { packageVersion } from '../internal/package-version.js';
 import { projectRelativePath } from '../internal/source.js';
+import { someSkippedAfterFailure } from '../run/records.js';
 /**
  * What a target's engine declaration says about it: the one description the
  * runner grades against and the report records. A target without an engine is
@@ -155,20 +156,22 @@ function serializeTarget(config, target, provenance) {
         ...(provenance ?? describeTarget(target)),
     };
 }
-/** Computes report-1 summary counts from results. */
+/** Computes report-1 summary counts from results; the status counts are over the selected ones. */
 function computeSummary(results) {
     let selected = 0;
     let executed = 0;
     let passed = 0;
     let failed = 0;
+    let interrupted = 0;
     let flaky = 0;
     let skipped = 0;
     for (const result of results) {
-        if (result.selected)
-            selected += 1;
         if (result.attempts.length > 0 || (result.serialGroupId !== undefined && result.status !== 'skipped')) {
             executed += 1;
         }
+        if (!result.selected)
+            continue;
+        selected += 1;
         switch (result.status) {
             case 'passed':
                 passed += 1;
@@ -178,15 +181,17 @@ function computeSummary(results) {
                 break;
             case 'failed':
             case 'timed-out':
-            case 'interrupted':
                 failed += 1;
                 break;
+            case 'interrupted':
+                interrupted += 1;
+                break;
             case 'skipped':
                 skipped += 1;
                 break;
         }
     }
-    return { discovered: results.length, selected, executed, passed, failed, flaky, skipped };
+    return { discovered: results.length, selected, executed, passed, failed, interrupted, flaky, skipped };
 }
 /**
  * A run is `blocked` — not failed — when it did not pass and *every*
@@ -195,14 +200,17 @@ function computeSummary(results) {
  * nothing contradicts that. One genuine failure keeps the run failed, and so
  * does any run-level error (a launch that never came up, a cleanup or report
  * write that failed): it is its own fact about the run, not a blocked step,
- * and it must stay visible to a host reading the status. Derivation requires
+ * and it must stay visible to a host reading the status. So does a skip after
+ * a failure under `failOnSkippedFailure`. Derivation requires
  * positive evidence, never absence of it.
  */
-function deriveRunStatus(status, results, serialGroups, runErrors) {
+function deriveRunStatus(status, results, serialGroups, runErrors, failOnSkippedFailure) {
     if (status !== 'failed' && status !== 'error')
         return status;
     if (runErrors.length > 0)
         return status;
+    if (failOnSkippedFailure && someSkippedAfterFailure(results, serialGroups))
+        return status;
     // Serial members carry no attempts of their own; their failing error lives
     // on the group's last attempt (or its failing member).
     const groupCode = new Map();
@@ -320,7 +328,7 @@ export function buildReport(options) {
                 name: 'e2e',
                 version: packageVersion(import.meta.url, '../../package.json', '0.0.0'),
             },
-            status: deriveRunStatus(options.status, options.results, options.serialGroups, options.runErrors),
+            status: deriveRunStatus(options.status, options.results, options.serialGroups, options.runErrors, config?.failOnSkippedFailure === true),
             exitCode: options.exitCode,
             startedAt: options.startedAt,
             finishedAt: timestamp(),

package/dist/report/failure-text.d.ts

@@ -34,7 +34,12 @@ export declare function detailLines(error: ReportError | undefined): string[];
  * called with, which reads as code.
  */
 export declare function stepLabel(step: ReportStep, max?: number): string;
-/** The attempt whose story a block tells: a flaky test's last failure, otherwise the final one. */
+/**
+ * The attempt whose story a block tells: a flaky test's last failure; for a
+ * failed or timed-out test, the last attempt that reached that verdict, so a
+ * retry the run interrupted (or a serial member that retry never reached)
+ * tells nothing; otherwise the final one.
+ */
 export declare function toldAttempt(result: ReportResult, final: Outcome): AttemptView;
 /** A step that did not pass. */
 export type FailedStep = ReportStep & {

package/dist/report/failure-text.js

@@ -69,9 +69,19 @@ function screenUrl(url) {
         return url;
     }
 }
-/** The attempt whose story a block tells: a flaky test's last failure, otherwise the final one. */
+/**
+ * The attempt whose story a block tells: a flaky test's last failure; for a
+ * failed or timed-out test, the last attempt that reached that verdict, so a
+ * retry the run interrupted (or a serial member that retry never reached)
+ * tells nothing; otherwise the final one.
+ */
 export function toldAttempt(result, final) {
-    return result.status === 'flaky' ? (final.lastFailed ?? final.final) : final.final;
+    if (result.status === 'flaky')
+        return final.lastFailed ?? final.final;
+    if (result.status === 'failed' || result.status === 'timed-out') {
+        return final.attempts.findLast((attempt) => attempt.status === 'failed' || attempt.status === 'timed-out') ?? final.final;
+    }
+    return final.final;
 }
 /** The step a failure happened at: the first that did not pass, with its position. */
 export function failedStepOf(steps) {
@@ -87,9 +97,9 @@ export function failedStepOf(steps) {
  */
 export function attemptsLine(result, final) {
     // An attempt that recorded nothing for this test (a serial group that never
-    // reached the member) says nothing about how the test fails.
+    // reached the member), or one the run interrupted, says nothing about how the test fails.
     const failed = final.attempts
-        .filter((attempt) => attempt.status !== 'passed' && attempt.status !== 'skipped' && (attempt.error !== undefined || attempt.steps.length > 0))
+        .filter((attempt) => attempt.status !== 'passed' && attempt.status !== 'skipped' && attempt.status !== 'interrupted' && (attempt.error !== undefined || attempt.steps.length > 0))
         .map((attempt) => ({
         code: cell(attempt.error?.code ?? attempt.status, 128),
         step: failedStepOf(attempt.steps)?.index,

package/dist/report/format.d.ts

@@ -58,20 +58,25 @@ export declare function rule(text: string, align: 'center' | 'right'): {
 export interface Counters {
     passed: number;
     failed: number;
+    interrupted: number;
     flaky: number;
     skipped: number;
     total: number;
 }
 export declare function emptyCounters(): Counters;
-/** The counter a result status lands in: every non-success status is a failure. */
-export declare function statusBucket(status: ResultStatus): 'passed' | 'failed' | 'flaky' | 'skipped';
+/**
+ * The counter a result status lands in. A timeout is a failure; an
+ * interrupted test was stopped by the run, not by its own verdict, so it
+ * counts on its own.
+ */
+export declare function statusBucket(status: ResultStatus): 'passed' | 'failed' | 'interrupted' | 'flaky' | 'skipped';
 /** Counts results by bucket; `total` is the number of items. */
 export declare function tally(items: readonly {
     readonly status: ResultStatus;
 }[]): Counters;
-/** A file's outcome from its tests: failed if any did, skipped if all did, else passed. */
-export declare function fileOutcome(counters: Counters): 'passed' | 'failed' | 'skipped';
-/** `2 failed | 10 passed | 1 flaky (13)` in vitest's colors and order. */
+/** A file's outcome from its tests: failed if any did, else interrupted if any was, skipped if all were, else passed. */
+export declare function fileOutcome(counters: Counters): 'passed' | 'failed' | 'interrupted' | 'skipped';
+/** `2 failed | 1 interrupted | 10 passed | 1 flaky (14)` in vitest's colors and order. */
 export declare function stateString(pc: Colors, counters: Counters): string;
 export interface AiUsage {
     calls: number;

package/dist/report/format.js

@@ -96,11 +96,15 @@ export function rule(text, align) {
     return { before: LONG_DASH.repeat(before), after: LONG_DASH.repeat(after) };
 }
 export function emptyCounters() {
-    return { passed: 0, failed: 0, flaky: 0, skipped: 0, total: 0 };
+    return { passed: 0, failed: 0, interrupted: 0, flaky: 0, skipped: 0, total: 0 };
 }
-/** The counter a result status lands in: every non-success status is a failure. */
+/**
+ * The counter a result status lands in. A timeout is a failure; an
+ * interrupted test was stopped by the run, not by its own verdict, so it
+ * counts on its own.
+ */
 export function statusBucket(status) {
-    return status === 'passed' || status === 'flaky' || status === 'skipped' ? status : 'failed';
+    return status === 'timed-out' ? 'failed' : status;
 }
 /** Counts results by bucket; `total` is the number of items. */
 export function tally(items) {
@@ -111,18 +115,21 @@ export function tally(items) {
     }
     return counters;
 }
-/** A file's outcome from its tests: failed if any did, skipped if all did, else passed. */
+/** A file's outcome from its tests: failed if any did, else interrupted if any was, skipped if all were, else passed. */
 export function fileOutcome(counters) {
     if (counters.failed > 0)
         return 'failed';
+    if (counters.interrupted > 0)
+        return 'interrupted';
     if (counters.total > 0 && counters.skipped === counters.total)
         return 'skipped';
     return 'passed';
 }
-/** `2 failed | 10 passed | 1 flaky (13)` in vitest's colors and order. */
+/** `2 failed | 1 interrupted | 10 passed | 1 flaky (14)` in vitest's colors and order. */
 export function stateString(pc, counters) {
     const parts = [
         counters.failed > 0 ? pc.bold(pc.red(`${counters.failed} failed`)) : undefined,
+        counters.interrupted > 0 ? pc.bold(pc.yellow(`${counters.interrupted} interrupted`)) : undefined,
         pc.bold(pc.green(`${counters.passed} passed`)),
         counters.flaky > 0 ? pc.yellow(`${counters.flaky} flaky`) : undefined,
         counters.skipped > 0 ? pc.gray(`${counters.skipped} skipped`) : undefined,